Initial Commit
Merge branch 'master' of https://github.com/osintegrators/ScalaGranny

Conflicts:
	.gitignore
.gitignore fix