auto
Merge branch 'master' of github.com:thaibault/website

Conflicts:
	index.tpl