Merge branch 'master' of https://github.com/paulhession/protocol-docs

Conflicts:
	.gitignore