added timeouts
Merge branch 'master' of github.com:kghandhi/cmsc23310