push de fin de journée!!!
Merge branch 'master' of https://github.com/RagnarLodbrok/HackathonStantum

Conflicts:
	index.html