Fixed index values

Improved how we select a card from the deck (always first one)
Resolved conflict
Merge branch 'master' into gh-pages