Biiiiiirdiiiiies
Merge branch 'master' of github.com:guillaume-gouchon/island

Conflicts:
	app/scripts/main.js