woo the game is coming together!
Merge pull request #14 from kliffy/big_changes_branch

woo the game is coming together!