fixed associations and some factories
fixed merge conflicts on spec_helper and user model
debugging crush tests
Removed voteable and replaces with votes in crush test/controller
Merged with rspec changes
started on crush controller & index view
added ajax to upvote and downvote the crushes, saving to the database
Commit for merge to master
Merged gemlock, no testing on styling conflicts
Changed spec to show redirect after login to root instead of user/:id, as ari changed the controller to do so