Merge branch 'master' of https://github.com/Chase-C/OldWestDuel
Merge branch 'chase' of https://github.com/Chase-C/OldWestDuel
In the middle of adding peaks stage