Removing Sublime workspace from versioning
Merge remote-tracking branch 'origin/master'

Conflicts:
	sublime/phaser-shooter.sublime-workspace