initial creat
Merge branch 'master' of github.com:czcollier/scala-template-project.g8

Conflicts:
	.gitignore