initial commit
Merge branch 'master' of https://github.com/evancasey/intro-to-scala

Conflicts:
	README.md