ny ekvation för study 3
Merge branch 'master' of github.com:tobyndax/TSDT14

Conflicts:
	Report/report.tex