some changes
Merge branch 'master' of https://github.com/slize/MDD_Sandbox

Conflicts:
	paper/paper_conclusion.tex