fixing merge conflicts
updated animation fucntions, still needs to move current card to hand
Merge branch 'dev' into animate
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
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
added landing page video
merge conflicts bro
fixed merge conflicts w/peter's push to animate branch. BRO
Merge branch 'animate' of http://github.com/the-hobbes/softwareEngineeringFinalProject into animate
finished #59
completed enhancement #60
Merge branch 'animate' into dev
Added tommy and merged in with video enhancments #58