CSS MAIN revue
Merge branch 'master' of https://github.com/Akajiro/EarthProject

Conflicts:
	public/css/style.css