Week 1 - Functional programming in Scala
.gitignore updated
Merge branch 'master' of https://github.com/mariadelmarrg/progfun

Conflicts:
	.gitignore