Closed issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Exit.js
	Assets/Scripts/rocketshipController.js