imported gson to the proper location
Merge branches 'battle' and 'master' of https://github.com/math1man/SuperMacalester into battle