Initial Commit
Merge branch 'master' of https://github.com/joe182/scala-coursera

Conflicts:
	.gitignore