mrege upstream
fix to level names
merge master
Fix weird level bug
remove bullshit
Merge pull request #1 from sbryant31/master

Minorfixes