Made MAJORITY code less fucky
Merge branch 'master' of https://github.com/MarcGroef/katPrison