HTML  update
html update
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
layout
Merge branch 'master' of https://github.com/jeanparreno/elective_project