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
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
popup appears with correct text and can be closed. size of popup needs fixed
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
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
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