Merge branch 'issue2' into develop
Merge branch 'develop' of https://github.com/klinginE/ShootOut.git into develop