Change data array to be less stupid and more API compatible
Add Calendar and tableView
Merge branch 'Calendar'

Conflicts:
	.DS_Store
	ShortPath/.DS_Store
	ShortPath/Pods/.DS_Store
	ShortPath/Pods/Pods.xcodeproj/project.pbxproj
	ShortPath/ShortPath.xcodeproj/project.pbxproj
	ShortPath/ShortPath.xcodeproj/xcuserdata/Dare.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	ShortPath/ShortPath/Base.lproj/Main.storyboard
	ShortPath/podfile
Adding .DS_Store to gitignore
Add Calendar to master