Minor changes to Control (change return type)
Iteration through arrayList returned by findLocations
Merge remote-tracking branch 'origin/master'

Conflicts:
	DSCW/src/code/Control.java