Stuff
Merge branch 'master' of https://github.com/apiccato/kittens

Conflicts:
	api.pyc