suite 7
j'espere ne pas me tromper
Merge branch 'master' of https://github.com/mloeuk/cubbyhole

Conflicts:
	js/mycubby.js