add time+15; time+30
Merge branch 'master' of https://github.com/chinab91/micecolab