added recipe name to database table and moved folders to proper place
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/recipes_controller.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/recipes_controller.rb
created form, edit, and new html and updated recipe controllers
created form, edit, and new html and updated recipe controllers
Merge remote-tracking branch 'origin/master'