adding in routes for users, meals, ratings
clearing gemfile conflict;
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
generated rspec rails
set up the associations for ratings
setup user company relationship and seed db
adding profile photo to users with paperclip
fix merge conflict in user.rb
clearing user.rb conflict
meals updated
add goals to seed file
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
fixed MC:meal model and routes