学习markdown
Merge branch 'master' of github.com:luoweipeter/studypython

Conflicts:
	markdowntest.md