I'm tired
Merge branch 'master' of https://github.com/FnTm/movesync

Conflicts:
	app/index.html
	app/scripts/model.js