change i made months ago, I think i fixed the units
Merge branch 'master' of https://github.com/aadavids/rts_server

Conflicts:
	src/units/Unit.java