sync
Merge branch 'master' of https://github.com/mart1nez10/MazeGame

Conflicts:
	Key.cpp
messed up