last minute changes
sundaymorning
Merge branch 'master' of https://github.com/johntoyne/Mantherapy_final

Conflicts:
	Scripts/main2.js