math1man/SuperMacalester — pull request #4 by math1man (2014-03-12 01:43:49+00:00)
Title: Dev

Dev and Battle have converged, and since they are currently identical, I'm going to merge them into master and delete Dev. We will go from there