Fixat något
prep for pull
Merge branch 'master' of github.com:noraply/TSBK07labbar

Conflicts:
	lab3-2013/makefile