youtube popup added
merge
Merge branch 'master' of https://github.com/FnTm/movesync
lost lines added
important fix
Merge branch 'gh-pages'

Conflicts:
	app/index.html