Merge branches 'battle' and 'dev' of https://github.com/math1man/SuperMacalester into battle
Merge branches 'battle' and 'dev' of https://github.com/math1man/SuperMacalester into battle