yoy
Merge branch 'pierre'

Conflicts:
	static/style.css
	templates/index.html