revenge of the sync
?

Conflicts:
	TuxWeapons/TuxCraft/Assets.java