something
Merge origin/master
something else
Merge origin/master

Conflicts:
	src/model/agent/Digger.java
things working
Merge origin/master