初次提交，不成敬意
Merge branch 'master' of github.com:ssjssh/ask

Conflicts:
	.gitignore
	README.md