Background refresh.
Merge branch 'master' of github.com:terjr/thesis

Conflicts:
	report/background/simulators.tex