finished proj, added code for timeouts
Merge remote-tracking branch 'origin/master'