Merge branches 'battle' and 'dev' of https://github.com/math1man/SuperMacalester into dev
Merge branch 'dev' of https://github.com/math1man/SuperMacalester into dev
Merge branch 'dev' of https://github.com/math1man/SuperMacalester into dev
Updated sprites in the plot