Merge pull request #1 from kirbyman62/master

Silly me should have updated then made new branches,
Merge pull request #3 from kirbyman62/level-editor

Merge pull request #1 from kirbyman62/master