Merge pull request #1 from xzel/Dan

init card functionality
switched folders
Merge branch 'master' of https://github.com/xzel/cis197_final
switched folders
GUI should be done. Also some marionette
Merge branch 'master' of https://github.com/xzel/cis197_final
Edits