[#60826864] starting on new when and where section
Merge branch 'cop-p2-2013' of https://github.com/vuwfg/knots into cop-p2-2013
[#60826864] google maps API map added to when and where
Merge branch 'cop-p2-2013' of https://github.com/vuwfg/knots into cop-p2-2013