adding timeout class
Merge branch 'master' of github.com:adrianmiranda/startup