synced txt file
various updates
Merge branch 'master' of https://github.com/bacampbe/diameter-overload-drafts

Conflicts:
draft-donovan-doic-endpoints-00.xml
trying to fix conflicts
Merge branch 'master' into ben-work-in-progress

Trying to fix a merge issue.