added timeout
Merge branch 'master' of https://github.com/loo-cindy/TA-Assignment