Fix issue with time jumping
Add color legend
Merge branch 'master' of https://github.com/ubc-magic-students/enph479-2013