merge with altarys
Merge branch 'master' of https://github.com/jpeyraud/Annual_Project.git

Conflicts:
	src/Menu.cpp
	src/Menu.h