Start of highest-level gameplay strategy.  Fixed map-drawing.
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1
Adding main to top-level game playing state
Merge