timeout handling
Merge branch 'master' of github.com:tsliwowicz/fartroulette