Merge pull request #24 from flubbes/update-1

merge update-1 into jos
Merge pull request #29 from flubbes/update-1

merge update-1 into jos
ADDED card deck shizzle
Merge pull request #35 from flubbes/jos

merge jos into update-1