Rough copy.
Merge branch 'master' of https://github.com/Wixel/Markup-Style-Guide

Conflicts:
	README.md
no message
Rough copy.