javascript functions for searching songs and retrieving objects working
Merging after resolving conflicts in other branch
Merge branch 'master' into music_player_functionality
Removed a couple of lines to fix bugs (will come back to change)
Merge pull request #9 from pocket-gophers-2014/music_player_functionality

Music player functionality