moved ifs
Merge branch 'master' of github.com:ga2arch/Doom