Put all the libgdx back
Merge branch 'battle' of https://github.com/math1man/SuperMacalester into dev