okay
Merge branch 'master' of https://github.com/frigilive/Lab4.Project.git

Conflicts:
	Lab4/src/Lab4.cpp