change
merge
Merge branch 'master' of https://github.com/daviddao/TexMMMK

Conflicts:
	MMMK.pdf
	MMMK.synctex.gz