UICollectionView delegate methods running, but nothing shows up.  Pushing to share with team.
Merge branch 'master' of https://github.com/TBITracker/taskplanner

Conflicts:
	TBITaskPlanner/en.lproj/MainStoryboard.storyboard