=adding web-server and controller
Merge branch 'master' of https://github.com/bcgraham/pokerserver

Conflicts:
	controller.go
=not done
=resolved game & controller conflicts