I hat you all
:wMerge branch 'master' of github.com:dabaus/DD2387_lab1

Conflicts:
	README.lab1