Merge pull request #11 from mcruthven/master

Combine settlement and resource algorithms
Merge pull request #12 from mcruthven/master

changing water weight
Merge branch 'master' of https://github.com/alexadkins/Catan-Pathfinder