Remove the junk from the previous commit
Merge branch 'master' of https://github.com/Warsow/qfusion