Broke everything
fixed merge conflicts (and broke everything)
Merge branch 'master' of https://github.com/rdedhia/PoE_Paintball