Pulling from master
Deletes extra phantom CSS file
Pulling from master
Deletes extra phantom CSS file
Merge branch 'front_end' of https://github.com/ospreys-2014/Kendrick into front_end
Merge pull request #66 from ospreys-2014/front_end

Front end
fix merge conflicts
add mj
add assets
ratings placeholder add to artist show page
create nested routes for rating users (artists really)
create accessible object for the artist and accessible object for the current user who is logged in
add partial for a form that allows rating
removed unnecessary index route for ratings
update create to permit the params
add rating form to rate an artist
assigned params for artist_id to a variable for readability
removed empty method from user model
add methods to average the ratings for any given entity (ie, artist, review, comment)
removed old averaging method