video link
Merge branch 'master' of https://github.com/johntoyne/Mantherapy_final

Conflicts:
	mob/index.html
	mob/js/mob.js