fixed conflig
Merge pull request #4 from ph3b/JJ-DOOM-master

fixed conflig