fixing time
Merge branch 'master' of github.com:lab11/gatd-lab11