fixing merge conflicts
updated animation fucntions, still needs to move current card to hand
Merge branch 'dev' into animate
merge conflicts
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