integration
Merge branch 'newShootercode' of https://github.com/irs1318dev/irs1318_2014 into newShootercode