put the default/starting map to map1
deleted the test map
Merge remote-tracking branch 'origin/master'

Conflicts:
	Agent.cpp