Fixed cookie and road building.
Merge branch 'master' of https://github.com/reedcwilson/catan
Merge and fixes