Initial Commit
Merge branch 'master' of
https://github.com/keithmattix/ProgrammingCompScala.git

Conflicts:
	.gitignore