Added logging
Merge branch 'google_log' into shapes_and_intersections