recup' travail alizée
Merge branch 'master' of https://github.com/alizeear/almy

Conflicts:
	script/almy.js