Modules 1-4
Merge branch 'master' of github.com:mariuskueng/OOPL1

Conflicts:
	.gitignore