Before Sync
Merge branch 'design' of https://github.com/ougrimley/equitabletod into design

Conflicts:
	app/.DS_Store