Added weapons and combat testing
Added weapons and combat testing
Merge branch 'master' of https://github.com/noobpurple/LD14