first commit
Merge branch 'master' of github.com:maoluanjuan/sms

Conflicts:
	.gitignore