Working on percentage and logout styling
added working tests for clips_controller, user model
added passing user model tests for percent_rating function
Added Approval Rating and Updated Nav Bar
  - User Rating updated on page load in nav bar
  - Styling updated
Merge pull request #63 from red-admirals-2014/updated_navbar_and_user_rating

Updated navbar and user rating
more user model tinkering
Merge branch 'master' into amy_testing_wed
getting latest version of master
restored failing tests
Merge pull request #64 from red-admirals-2014/amy_testing_wed

Amy testing wed

![](http://a.gifb.in/384yusw280sw.gif)
Merging some of Amy's tests in with current code.

Merge branch 'master' into vote_has_been_accepted