Merge branch 'master' into JonM
Fixed multi ingredient search, and started on advanced search settings
Fixed search and two advanced search choices
Worked on search result presentation
Delete search_recipes.js
Minor change on layout
Merge branch 'JonM' of https://github.com/Overhead/RecipeSite into JonM
Changed first page, url parameters and semifunctional back button on search results
Fixed relation between recipe and ingredient, and started work on viewing recipe site
Worked a little on specific recipe site, and displaying search result
Added froms for handeling users. No validation yet
Merge pull request #7 from Overhead/userforms

Added froms for handeling users. No validation yet
Worked on a little styling and content presentation
Merge branch 'JonM' into dev
Merge branch 'dev' into JonM
Change to the login system, request profile from google
still need to update the db to reflect the changes in the new
model.
Merge branch 'userlogin' into dev
Migrate db to reflect new user model
Updated page style
Merge branch 'JonM' into dev