Using i-d-template
Adding link to README.md
Resolving merge conflicts
Merge branch 'martinthomson-templatify' (PR #30)