PLAQUAGE + CORDE A L'INGE
Merge branch 'master' of https://github.com/nanarchrist/Mistery

Conflicts:
	build/main.js
	src/manifest.js