Fly
Merge branch 'master' of https://github.com/vripoche/hackathon

Conflicts:
	js/main.js