vack3
Merge branch 'master' of https://github.com/Car092/Test2

Conflicts:
	Test2_sol/Test2/Main.cpp