jaggerestep/ColonialMarines — pull request #85 by apophis775 (2014-12-13 01:33:43+00:00)
Title: Updates and stuff

Conflicts fixed