5
Merge branch 'master' of github.com:wjp2013/play_git

Conflicts:
	README.md