init
Merge branch 'master' of https://github.com/athanclark/markup

Conflicts:
	markup.cabal
	src/Data/Markup/Class.hs
	src/Data/Markup/Types.hs