Merge branch 'ssing'

Conflicts:
	Makefile
	main.tex