Solution testing update
Merge branch 'master' of https://github.com/DaysOfThePhoenix/TeamFranciumRepository

Conflicts:
	Game15Test/Game15Test.csproj