Init Commit
Merge branch 'master' of
https://github.com/petrbouda/notes-spring-scala.git

Conflicts:
	.gitignore