server update
Merge pull request #11 from LukePulverenti/master

server update