Merge branch 'master' of https://github.com/DaSavior/Level_Editor
Merge remote-tracking branch 'origin/master' into Micah