old commits
Merge branch 'master' of github.com:karlward/cooperate-defect

Conflicts:
	browser/src/index.html
	server/src/server.js
Merge branch 'master' of github.com:karlward/cooperate-defect
merge fix
added control and fixed something i messed up