Done with tokens
Still merging..
Merge remote-tracking branch 'refs/remotes/origin/zach-gameroom-stuff' into sean-token-generation
Update README.md
Update README.md
Update README.md
Merge branch 'master' of https://github.com/iph/catan into sean-token-generation

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Added some more description to the readme. Went and flipped error as the second arg to be returned.