initial commit
Merge branch 'master' of https://github.com/Fxe/SpringApp

Conflicts:
	.gitignore