fuck it that'll do for now
Merge branch 'master' of https://github.com/patrickbjohnson/project-kitty