Merge branch 'rollerball'
Merge branch 'master' of https://github.com/HJohnson-/Kingtaker
with roller ball