Fixed overwrite from last commit to fix scaling
Merge branch 'master' of https://github.com/cmpt371Group1/Patient-Life-Simulator

Conflicts:
	phonegap/www/index.html