Merge problem resolved
Merge branch 'master' of https://github.com/CuST0M1z3/HighQualityCode-TeamProject

Conflicts:
	Refactored-Labyrinth-1/bin/Debug/Labyrinth.exe
	Refactored-Labyrinth-1/bin/Debug/Labyrinth.pdb
	Refactored-Labyrinth-1/obj/Debug/Labyrinth.exe
	Refactored-Labyrinth-1/obj/Debug/Labyrinth.pdb