Pierrot added.
Merge branch 'master' of github.com:jgueytat/eBikeRivieraTour

Conflicts:
	app/.htpasswd