Working on 5.4
Merge branch 'master' of https://github.com/lundmikkel/SPPP

Conflicts:
	Ex5/ex5.md