functionality for negotiation sequence
Merge branch 'master' of https://github.com/amberr/piratekings

Conflicts:
	web/views/index.html