added draft version
Merge branch 'master' of https://github.com/manugit/gfm

Conflicts:
	index.php