Merge pull request #4 from eleddy/master

t
Merge pull request #5 from eleddy/master

1
fixed merge error
merge error
Merge pull request #23 from abutton/master

server chockers working