more styling!
Merge branch 'master' of https://github.com/MathRivest/oublie-pas

Conflicts:
	app/index.html