Merge pull request #5 from adslaton/dev

Dev
Merge branch 'master' of https://github.com/adslaton/server-stress into dev