added working tests for clips_controller, user model
added passing user model tests for percent_rating function
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)