Merge remote-tracking branch 'myell0w/master'

Conflicts:
	MarkdownAttributedString.xcodeproj/project.pbxproj
	MarkdownCatalog/CatalogViewController.m
	README.mdown
	grammar/MarkdownTokens.cpp
	grammar/MarkdownTokens.h
	src/MarkdownTokenizer.m
	src/MarkdownTokens.h
	src/MarkdownTokens.m
	src/NSAttributedStringMarkdownParser.h
	src/NSAttributedStringMarkdownParser.m