edited alex.nats.map and alex.nats.Player
changed name from alex.nats.map to Map
Merge branch 'master' of https://github.com/DeathTheFreaky/NATS.git

Conflicts:
	NATS/src/at/alex/nats/Player.java