Week 1 and Week 2
Merge branch 'master' of https://github.com/blaisebaileyfinnegan/scala-fp

Conflicts:
	.gitignore