up
up
Merge branch 'master' of https://github.com/maburo/SpringApp

Conflicts:
	.gitignore