test written and view exists
create action works
passes tests
unit and acceptance tests for activerecord complete
tests for the presence of a party key
merge conflict resolved
passes all tests
Merge pull request #7 from zstayman/create-party

Party created and all associations exist and party unit validates presence of party_key
Created Seed Data
Merge branch 'master' of https://github.com/itorres1/jukehacker into itorres1-master
merged api.rb
hold queue get
Create initial Grooveshark Method
fixed merge conflict
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