busted proj. file, merging fixed one for overwrite
Merge branch 'master' of https://github.com/TeamQSeniorProject/P5T

Conflicts:
	P5T/P5T.csproj