Fixed things gas mask something something
Merge branch 'master' of github.com:shanemarks/EvilOverlord
bux fixes