hold queue get
Merge branch 'master' into display-playlist
merge completed
fixed party model
Merge pull request #11 from zstayman/display-playlist

Party Model Fixed
basic controller test
all fixed
controller test done and working
Merge pull request #12 from zstayman/display-playlist

JSON request working
Create Grooveshark Method
merge fixed
added field for grooveshark input and removed duplicate parties
Merge pull request #14 from renagadex2/grooveshark-song-search

added field for grooveshark input and removed duplicate parties
displaying queue started
Merge branch 'master' into display-playlist
merge complete
queue refreshes automatically
Merge pull request #15 from zstayman/display-playlist

The Playlist displays
user can add a song via the internet to our db
merging