Added anchors and id's
more changes
Merge branch 'master' of https://github.com/NathanAtkinson/rtf-hackathon