Morrapuler
Merge branch 'master' of http://github.com/Hme89/MandatoryExerciseOne

Conflicts:
	README.md