Refactored shooting
Merge branch 'master' of github.com:tbporter/Cypher-Sydekick