merge
Merge branch 'master' of https://github.com/Daisuki91/esieagame

Conflicts:
	Makefile
	esiea-game
Merge branch 'master' of https://github.com/Daisuki91/esieagame
Add printf in menu.c
Merge branch 'master' of https://github.com/Daisuki91/esieagame

Conflicts:
	esiea-game