squashing - some gaps filled
Merge branch 'master' of https://github.com/szymtor/locfin

Conflicts:
	squashing.tex