added markeddown
Merge branch 'master' of https://github.com/zhouzhuojie/hastv2

Conflicts:
	.meteor/.finished-upgraders
	.meteor/.id
	.meteor/packages
	.meteor/release
	.meteor/versions
	client/views/display/displayIndex.html