Merge branch 'master' of github.com:marsj725/TDDD49 into winner

Conflicts:
	Mediator.cs