Gunslinger Changes
Merge branch 'master' of https://github.com/cbmullen/Code.git