bugfix, restructuring
avoid duplicates
redcarpet
Merge branch 'master' of https://github.com/Choms/asyd

Conflicts:
	Gemfile
redcarpet