added the joren object
added the name property
merge conflicts from megha's model
fixed merge conflicts
merge fix
Merge branch 'master' of https://github.com/codefellows/sea-b4-ios

Conflicts:
	gitfun/gitfun.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/codefellows/sea-b4-ios
Merge remote-tracking branch 'origin/master'