Merge branch 'pr/4' into pr/6

Conflicts:
app/assets/javascripts/application.js
app/views/home/_body.html.erb
app/views/myrecipes/index.html.erb