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

Conflicts:
	index.html
	main.go

ý5imekbkbkbmerkbkbkbmekbkbakbadded some stuff on main.go:wq:w!:q!
ý5iakb:w!:q!
added more stuff on main.go