"committing"
Merge branch 'master' of https://github.com/montanaj/EwwKittens

Conflicts:
	EwwKittens.xcodeproj/project.pbxproj