Initial commit
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	.gitignore