integrated markdown (not fully) got buggy but I want to sleep
Merge branch 'master' of github.com:jLukeC/advanced-text-editor

Conflicts:
	.gitignore
	.gitignore~
	advanced_text_editor.py