Merge remote-tracking branch 'origin/master'

AllenCoder · AllenCoder · commit 25788d60b561 · 2016-08-18T23:06:39.000+08:00
# Conflicts:
#	README.md
diff --git a/README.md b/README.md
@@ -47,4 +47,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-```
+```
