FOR MOAR GLORY
Merge branch 'master' of https://github.com/donl-porch/psychic-cyril