player pauses when no more clips, adding a popup to tell the user
merged master into my branch, kept all changes to master, all working or in progress code from branch
removed the variable single ladies and changed it to variable key
deleted unneccessary images
pulled recent master to merge with favicon branch

Merge branch 'master' of https://github.com/red-admirals-2014/Stage-Fright into add-favicon
favicons added
updated to latest master, when clips are exhausted; sound is paused, modal comes up, working on styling to appear correctly
Adding a partial that allows users to see when theyve voted succesfully
popup appears with correct text and can be closed. size of popup needs fixed
Added the button for like
Merge pull request #48 from red-admirals-2014/add-favicon

Add favicon
Fixing travis ci
Travis ci back to anne's fix
both form and no-clips open and close, issue: when form is closed, no-clips briefly shown
Travis has been fixed?
Merge branch 'master' into popup_no_songs
latest changes from master
Tried static positioning, deleted it"
;
Merge pull request #50 from red-admirals-2014/popup_no_songs

Popup no songs
Merge pull request #49 from red-admirals-2014/fixing_travis_ci

Fixing travis ci
fixed the rspec tests