some changes
Merge branch 'master' of https://github.com/cemosis/SEME

Conflicts:
	notes.tex