nov4
Merge branch 'nov4' of https://github.com/Julesjmpatry/TheArcticOrange

Conflicts:
	public/Scripts/Main.js