canvas panel

tricky algebra
Merge remote-tracking branch 'origin/alicjaBranch' into daxBranch

Conflicts:
	Escape/src/model/backbone/agent/Agent.java