cleanup
Merge branch 'master' of github.com:project-douglas/lllc-server

Conflicts:
	server.go