git conflicts are no fun
Merge branch 'master' of https://github.com/SomeKittens/Kittens-Chat