commit for merge
fix merge conflicts
Merge branch 'master' into cosimo
add user validation
merge conflict fixing
fixed merge. merged with cosimo
add .env to .gitignore
added unicorn to make postgres work with heroku
commented out sass-rails and coffee-rails to see if using this was causing the issue with heroku
precompiled assets to see if heroku can get fixed
add username and name test
Merge branch 'sophana'
added cosimo's testing work
added cosimo's testing work
changes made to app/model/rating
Refresh