Merge branch 'master' into Mills's-Branch
Custom Villagers & Trading
Merge branch 'master' into Mills's-Branch
Merge branch 'Mills's-Branch'
Merge remote-tracking branch 'origin/master' into Matt's-Branch

Conflicts:
	Greece.java
	client/ClientProxy.java