New commit, adding the entire codebase in one go.
Adding gitignore
Trying to merge .gitignore.

Merge branch 'master' of https://github.com/nporiord/scalaCoursera

Conflicts:
	.gitignore