-> Overrode hashCode() and equals() of the Marker class.  Two Markers
are now considered equal if their Ids and AntColor properties match.

This will make it possible for Coryn to implement the HashMap we
discussed yesterday if he wants to.  E.g.:

HashMap<Marker,boolean> markers = new HashMap<Marker,boolean>();

public void set(Marker m) {
	markers.set(marker, true);
}

public void remove(Marker m) {
	markers.set(marker, false);
}

public boolean contains(Marker m) {
	return markers.get(m);
}

Merge branch 'master' of https://github.com/Team17/AntGame.git

Conflicts:
	bin/antgame/core/InvalidMarkerIdException.class
	bin/antgame/core/Marker.class
Merge branch 'master' of https://github.com/Team17/AntGame.git
Renamed Propeties.xml -> CONFIG.xml

I imagine there might be another properties file with user-specific
values.  CONFIG.xml contains core values required for game operation.