Minor stuff
Merge branch 'master' of https://github.com/pond823/StarTrap

Conflicts:
	Level One.scriv/Files/binder.autosave
	Level One.scriv/Files/binder.backup
	Level One.scriv/Files/user.lock
	Level One.scriv/Level One.scrivx
	Level One.scriv/Settings/ui.plist