Update README.md
a
Update README.md
a
Update README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Squashed commit of the following:

commit 6858869ba0fa8383f3acb42da69e3b01026c9aea
Author: Cheng Tang <1990tc@gmail.com>
Date:   Fri Sep 26 14:29:58 2014 +0800

    Update README.md
Merge branch 'master' of github.com:BlueGood/BadPHP
a
Update README.md
a
Update README.md
Merge branch 'master' of github.com:BlueGood/BadPHP
Update README.md
a
Update README.md
a
Update README.md
a
Update README.md