Basics ConsoleMenu
Resolving conflicts
Merge branch 'master' of https://github.com/GFrenette-Lareault/TP2_Labyrinthe

Conflicts:
	TP2 Labyrinthe/ConsoleMenu.cpp
	TP2 Labyrinthe/TP2 Labyrinthe.vcxproj
	TP2 Labyrinthe/TP2 Labyrinthe.vcxproj.filters