Added web server logic
Merge branch 'master' of https://github.com/ziahamza/het

Conflicts:
	server/server.go