can we mix markdown and HTML?
Merge branch 'develop' of https://github.com/DigitalIRC/DigitalIRC-site into develop