Cristiano instead of kittens
Merge pull request #33 from HackSocNotts/dev

Cristiano instead of kittens