Try markdown
Merge branch 'source'

Conflicts:
	__pycache__/pelicanconf.cpython-33.pyc

That's fine all are deleted
To be merged with master
added git ignore