Fixed display.js bug
Last commit before rebase and eventual merge
Last commit before rebase and merge
initial commit and cards now being shown from deck
Fixed merge conflicts via rebase.
Merge branch 'player_hand_card_display' of github.com:raccoons-2014/Smackwangler into player_hand_card_display