1st week problems solved
Merge branch 'master' of github.com:joaoqalves/progfun

Conflicts:
	.gitignore