working with timeout again
Merge branch 'master' of https://github.com/sethrosetter/CSCI4211