moved stuff
Merge branch 'master' of https://github.com/macmania/golang-web-tour

ý5ifetched some stuff:wq:qkbW!:w!:w!:q!