basic
Sept. 30 - Beginning Responsive
Sept. 30 - User Navigation Dropdown
Oct. 1 - Font Update
More font stuff
Steve - Pre Merge
Merge branch 'Flat'

Conflicts:
	app/views/collections/index.html.erb
	app/views/recipes/index.html.erb