setup for testing jamie's group's code
Merge branch 'staging' of https://github.com/Azmisov/cs340-5horsemen.git into staging
setup for testing jamie's group's code