init
Merge branch 'master' of https://github.com/pawelslizak/springsample

Conflicts:
	.gitignore