Merge branch 'model' into gameRender
Merge branch 'model'
Merge pull request #18 from EJEHardenberg/deliverable2

Deliverable2
Made unit test box scrollable
Added Test Hardness code for game.py
Merge pull request #19 from EJEHardenberg/TestHarness

Test harness
Merge branch 'master' into deliverable2
Added Database stats to unit page
Merge branch 'temp' into deliverable2
Merge branch 'deliverable2'
Fixed issue #16 The problem was that too many classes were being placed ontop of each other, and one of those classes incremented the player click counter that is used to determine if we can fire off an ajax request or not. I fixed it, and tested it, looking at the state of the player and computer's hand. And we swapped cards, and the game continued normally
Merge branch 'master' into dev
Merge branch 'gameRender' into dev