removing .idea things
removing .idea things
Merge branches 'dev' and 'master' of https://github.com/math1man/SuperMacalester into dev
imported gson to the proper location
merged with master