Slight changes
Merge branch 'master' of https://github.com/WPFerg/scratch-app

Conflicts:
	scratch-player/Scratch.js