Committing so I can merge in Lauren's Ubercommit.
Merge branch 'rossdev' of github.com:Gastove/meanrecipes into rossdev

Conflicts:
	app/controllers/recipes_controller.rb

Resolved conflicts, mostly by favoring Lauren's work.
Merge branch 'master' of github.com:Gastove/meanrecipes into rossdev
Staging tweaks to seeds.rb.