Grid layout
Merge branch 'master' of github.com:chanbobby1/go-do-ios

Conflicts:
	Go/Do/TodayViewController.swift
	Go/Go.xcodeproj/project.pbxproj