player class
Merge branch 'master' into surface
Merge branch 'master' of https://github.com/DeathTheFreaky/NATS.git
Merge branch 'master' of https://github.com/DeathTheFreaky/NATS.git
Merge branch 'master' of https://github.com/DeathTheFreaky/NATS.git

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