Moved includes
Fixed weapon code
Merge pull request #4 from Patrik356b/nightly

Nightly