mer
Merge branch 'master' of https://github.com/LordCopper/OOAD2

Conflicts:
	BuiilderProject/ClassLib/NackademinEducation.cs
jensentestmethod