Website module design
Merge branch 'master' of https://github.com/nukems/projet-indus

Conflicts:
	modules/website/main.js