fix canDo methods
merge commits
make stuff work
Merge branch 'master' of https://github.com/reedcwilson/catan