Debut generation aleatoire
Merge branch 'master' of ssh://github.com/ericluong/voila

Conflicts:
	public/js/main.js