Figurer och skit.
Merge branch 'master' of https://github.com/pnutus/Sublabb

Conflicts:
	Beta/beta.tex