Add Conflict of Interest boilerplate#229

bit-png wants to merge 2 commits intoprivacytests:masterprivacytests/privacytests.org:masterfrom

bit-png:masterbit-png/privacytests.org:masterCopy head branch name to clipboard