Merging
Merged
Correct unitType names in CastleMenu
Merged
Merge branch 'master' of https://github.com/theorclord/GameDesignProject2014
more Menu stuff
More castleMenu stuff.. save doesn't work
Merged