test
Merge branch 'master' of
https://github.com/nhkim91/TDDC76-Projekt-SI.git

Conflicts:
	src/main.cpp