Merge branch 'master' of github.com:codeforbtv/foodrescue

Conflicts:
	app/controllers/pages_controller.rb