Merging
add paperclip gem to gemfile
add validation for avatar
fix migration for avatar
Removes numericality validation for rating model
Adds ratings controller #create
Merge pull request #71 from ospreys-2014/model_migration

Model migration
add default pic to artists when they dont upload their own
Merge pull request #73 from ospreys-2014/user_branch

User branch
Fixed merge conflicts
Merge branch 'front_end'
aligning ratings box
incorporated updates from rebase
updates from merges