made it green, made the zones the appropriate size
cannon zones and movement zones are shown when you click the button
fixed some cannon functionality:
charlie final commit
fixed merge conflicts, lets do this
final commit