Merge branch 'master' of https://github.com/Hypereive/ChaussetteMarket

Conflicts:
	index.html

Signed-off-by: machidoine <machidoine@gmail.com>