added comments
comment updates
weapon updates
A little cleanup
Minor Adjustments
Merge remote-tracking branch 'remotes/origin/Edwin' into steven

* remotes/origin/Edwin:
  weapon updates
  comment updates
  added comments
Updated Build Configurations
Minor Dependency changes
Merge branch 'steven' into development