start of env
Merge branch 'master' of github.com:ViktorCollin/cprog13

Conflicts:
	lab3/main.cpp