Pushing Copy
Merge branch 'TechPro_High_Steven' of https://github.com/MatthewBaldock/TechProProject into Matthew

Conflicts:
	COMP4952Medium/COMP4952Medium/App_Data/aspnet-COMP4952Medium-20141014055534.mdf
	COMP4952Medium/COMP4952Medium/App_Data/aspnet-COMP4952Medium-20141014055534_log.ldf
	COMP4952Medium/COMP4952Medium/App_Data/comp4952medium.mdf
	COMP4952Medium/COMP4952Medium/App_Data/comp4952medium_log.ldf
	COMP4952Medium/COMP4952Medium/Default.aspx
	COMP4952Medium/COMP4952Medium/Scripts/SiteScript.js
	COMP4952Medium/COMP4952Medium/bin/COMP4952Medium.dll
	COMP4952Medium/COMP4952Medium/bin/COMP4952Medium.pdb
	COMP4952Medium/COMP4952Medium/obj/Debug/COMP4952Medium.csprojResolveAssemblyReference.cache
	COMP4952Medium/COMP4952Medium/obj/Debug/COMP4952Medium.dll
	COMP4952Medium/COMP4952Medium/obj/Debug/COMP4952Medium.pdb