update gemfile.lock with bundle
Merge branch 'dev'
Merge branch 'dev'
add belongs_to :user
add create action
conflict resolution
fix merge conflict
Merge branch 'dev'
fix merge conflict in recipescontroller
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'