jsonkit added, json data input complete
Merge branch 'Chris' of https://github.com/dreamee21/Git into Chris

Conflicts:
	CollectionView1/CollectionView1.xcodeproj/project.pbxproj

CollectionView1/CollectionView1.xcodeproj/project.xcworkspace/xcuserdata
/Chris.xcuserdatad/UserInterfaceState.xcuserstate