switching branches
working on being able to create a recipe
fixed merge conflicts
creating recipe now correctly parses json and assigns it to the recipe fields
parsing now completely works with unlimited results; new tests written for recipe model and controller; added a new migration to change column from text to string
Search bar works and returns results from the database
Merge pull request #15 from fiery-skippers-2014/recipes

Recipes
Merge branch 'master' into search_bar_spike