w
Merge branch 'master' of https://github.com/TeamQSeniorProject/P5T

Conflicts:
	P5T/Models/ResearcherModel.cs
Work on OtherModel; replaced work on ResearcherModel in favor of remote upload