rewrote using gorilla websockets and martini for routing and handlers
Merge branch 'master' of https://github.com/stampzilla/stampzilla-go

Conflicts:
	server/webserver.go