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

Conflicts:
	public/CSS/Init.css
	public/CSS/Main.css
	public/Scripts/Main.js
	server.js