#16: fixing the increment bug
#16: implementing x-scale moving
Merge branch 'x-axis-time-scale-id-16'
#16: formatting second from epic time
Merge branch 'x-axis-time-scale-id-16'