msg
Merge branch 'master' of github.com:RonanDrouglazet/inShoot

Conflicts:
	static/index.html