Merge branch 'master' of /Users/justianmeyer/Documents/Grooveshark/nihilism with conflicts.
Fixed issue where new users would not get hands if current users didn't play a card
Merge branch 'master' of github.com:adam-bratin/nihilism