Feature #209 - Add functionality so that we can display only 120 characters of a recipe then redirect back to the original site - refactorized
Merge branch 'master' of github.com:4thsource/modernmeal

Conflicts:
	app/helpers/recipes_helper.rb
	app/views/recipes/show.html.erb
Merge branch 'master' of github.com:4thsource/modernmeal
Feature #46 - Weekly Planner - The weekly planner is still buggy
Merge branch 'master' of github.com:4thsource/modernmeal