commiter før pull
Merge branch 'master' of https://github.com/datasmurfen/is-105

Conflicts:
	lab/lab4/lab4.py
Merge branch 'master' of https://github.com/datasmurfen/is-105

Conflicts:
	lab/lab4/lab4.py
Merge branch 'master' of https://github.com/datasmurfen/is-105
Merge branch 'master' of https://github.com/datasmurfen/is-105
Test.Merge branch 'master' of https://github.com/datasmurfen/is-105
Lab 5 nesten ferdig
Lab 5