Merge branch 'master' of https://github.com/aryansbtloe/CKT

Conflicts:
	Application.xcodeproj/project.pbxproj