.
Merge branch 'master' of https://github.com/CheeseSoftware/WeaponsPlugin

Conflicts:
	src/ostkaka34/WeaponsPlugin/Weapon.java
	src/ostkaka34/WeaponsPlugin/WeaponsPlugin.java