BROKEN - more work on timeline framework
wrote calcStepRects method, some other timeline work
just some debugging text
Merge branch 'timelineframework'

Conflicts:
	TBITaskPlanner/TBITaskTimelineView.h
	TBITaskPlanner/TBITaskTimelineView.m
Timeline is at least being built -- content size isn't updating and add button is in the wrong place though
add step is broken, but timeline is being built properly.
This commit constitutes a delightful merge operation!

Merge branch 'master' of https://github.com/TBITracker/taskplanner

Conflicts:
	TBITaskPlanner/TBITaskTimelineView.h
	TBITaskPlanner/TBITaskTimelineView.m
	TBITaskPlanner/en.lproj/MainStoryboard.storyboard