working base, added scores to navbar, and user scores totals
Merge conflict resolution on controllers/decks
Merge pull request #19 from fiddler-crabs-2014/merge_conflict_2.20

Merge conflict 2.20