Merge pull request #14 from vdavid70619/master

Xiyang Dai HW1 Part1
Xiyang Resubmission: Fix the time axis bug