changes
Merge branch 'master' into ClientDevelopment

Conflicts:
	GameProject/bin/server/Map.class
Map exploring
changes
Added cool pictures!