Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
fixed issue #52 by doing a check for the endgame state in resetActiveFlags, and if the state was endgame, then calling the damn endgame method. BAM.
merging ethan's dev into phelan's dev
Fixed issue #54 before Phelan becuase we raced to do it. But its ok because we all love him even if he lost.
merged with ethan's scores display fix (issue #54 solved). also fixed merge conflicts
fixed issue #56 by removing line 300 in hal.py and adding a sleep timer. also, reduced the amount of time that hal loading lightbox is displayed
put full deck back into code
fixed issue with hal loader not displaying for any significant amount of time
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
Fixed isue #55, had to stop the propagation the click event throughout the dom tree.
Fixed the wrong glowing cards associated with issue #57
Fix for issue #57
took out extraneous log
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
fixed merge conflicts w/peter's push to animate branch. BRO
Merge branch 'animate' of http://github.com/the-hobbes/softwareEngineeringFinalProject into animate