putting Josh's commit back in
Merge branch 'staging' of https://github.com/Azmisov/cs340-5horsemen.git into staging