Merge branch 'deliverable2' into HAL
Merge pull request #4 from the-hobbes/dev

Merging pull request #4 from Phlean to get player character avatar
Refactoring code to be more modular and use the active state of a card to decided to glow it. Fixed typo in game.py that glows the opponents cards instead of the player's when transitioning to player choice state
working on getting active states to glow cards. Swap glow stopped working for some reason
Merge branch 'dev' of github.com:EJEHardenberg/softwareEngineeringFinalProject into dev
Fixed glowing problem where the deck and discard didnt glow after returning from a HAL state
Need to investigate the swap card glowing and the oddness of glowing only happening a little bit
working on making the endgame state work
working on endgame and datastore interactions
simplified datastore (removed certain tabulation fields) as well as working on datastore interaction model
fixed something with the draw2player choice state
merged in pull request #5
Merge branch 'dev' into HAL
Added swap function to HAL class
Added alzheimer function to decrement the memory
Added peek functionality to HAL
Added basic choose discard and deck choice
fixed merge conflict (removed init method) in HAL
fixed another merge conflict, this time in game.py
fixed some indentation errors in hal