init
Merge branch 'master' of github.com:jahelai/spring-mvc-demo

Conflicts:
	.gitignore