Updating canvas - everything in JS file
Merge branch 'master' of https://github.com/xssoftware/ladiesinspace

Conflicts:
	shipInSpace.js
Updating JS file