Fixing things
Merge branch 'master' of https://github.com/Zilacon/APOC-RPG.git