jojoij
Merge branch 'master' of https://github.com/SuperPanda42/SaveTheEarthReturn

Conflicts:
	default/Nuit2Info/views.pyc
Merge branch 'master' of https://github.com/SuperPanda42/SaveTheEarthReturn

Conflicts:
	default/Nuit2Info/urls.pyc
	default/Nuit2Info/views.pyc
	default/templates/base.html