init commit
clean up
Merge branch 'master' of github.com:aaronjiu/hsf-spring-annotation

Conflicts:
	.gitignore
	README.md