removed the variable single ladies and changed it to variable key
Adding a partial that allows users to see when theyve voted succesfully
Added the button for like
Tried static positioning, deleted it"
;
fixed the rspec tests
Fixed merge conflict
Merge pull request #51 from red-admirals-2014/rspec_clips_controller

fixed the rspec tests
Merging with local branch

Merge branch 'master' into vote_has_been_accepted
Fixed merge conflicts and works with testing
adding amy's changes
Updatead the style sheet so I wouldn't break anything
Fixed media issues
Merge pull request #53 from red-admirals-2014/vote_has_been_accepted

Vote has been accepted
microphone request shows up when microphone is clicked
Merge branch 'master' into move_mic_request
getting latest master