a
Merge branch 'gh-pages' of https://github.com/FnTm/movesync into gh-pages

Conflicts:
	app/demo3.js
	app/index.html