clean up
Merge branch 'master' of github.com:arnef/sto

Conflicts:
	u1-blubb.log
	u1-blubb.synctex.gz