adding in routes for users, meals, ratings
clearing gemfile conflict;
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
adding profile photo to users with paperclip
clearing user.rb conflict