added some tests
Merge branch 'master' into testingbranch

Conflicts:
	src/Catty/iPhone.storyboard
Merge branch 'testingbranch'

Conflicts:
	src/Catty.xcodeproj/project.pbxproj