adding in server changes
Merge branch 'master' of http://github.com/rileynat/Yahtzee
because I said so