Initial commit
git ignore
ignory
Merge branch 'master' of https://github.com/cezarygerard/scala

Conflicts:
	.gitignore