first commit
Merge branch 'master' of github.com:fzheng/spring

Conflicts:
	.gitignore