Merge remote-tracking branch 'origin' into YuHeng
Added MapDiagram, small changes to Driver and Map.
Fixed Time to handle XX:60xm.
Merge pull request #16 from YuHChen/YuHeng

Yu heng