Update server ip
Merge branch 'gh-pages' into walkthrough
Clean up