Lab1-4
Lab1-4
Merge branch 'master' of https://github.com/niklasericson/Lab

Conflicts:
	Lab1/lab1-1.cc
	Lab1/lab1-3.cc