Update README.md
Merge branch 'dev'
Base taken from 'new user'
Merge branch 'JonM' into dev
Merge branch 'JonM' into dev
Merge branch 'JonM' into dev
stash stuff
Merge branch 'new-recipe-stash' into dev
Found the recipe code again
Updated the layout, fixed primitive popover with matching ingredient names.
Fix but i made. Rename css class that were already in use.
Fixed conflict in merge with JonM branch
Fix https://github.com/Overhead/RecipeSite/issues/14.
hotfix for ingredient presentation on yummly
Created simple API that returns JSON
updated recipe controller
Merge branch 'API' into dev
Delete .pydevproject
Delete .gitignore~
Fix new recipe so that we can add ingredients from that view directly.