index.html
Merge branch 'develop', remote-tracking branch 'origin' into staging
Merge branch 'master' of https://github.com/romano-m/bitstarter

Conflicts:
	index.html
personnal data Lepix