Second commit

Updated weapons class