Merge branch 'm-gamma' into s-gamma
Changed test class to make gamma controllers
Merge branch 's-gamma' of github.com:scornman/Strategy-Game-SC-MC into s-gamma
merging scotts test fix for gamma