adding server chanes
Merge branch 'master' of https://github.com/trevynmeyer/fishermen