started hard coding in the map constants (not finished)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final Project/bin/constants/Map.class