Update
Merge branch 'master' of github.com:davidebettio/rails3-nginx-unicorn

* 'master' of github.com:davidebettio/rails3-nginx-unicorn:
  Update server.txt