gtfo ds stores
Merge branch 'master' of https://github.com/patrickbjohnson/project-kitty

Conflicts:
	.DS_Store
	app/.DS_Store