Working menu
Merge branch 'first-menu'
Small refactoring on characters
Temporary assets for the welcome menu
Merge branch 'master' of https://github.com/ushu/z-project

Conflicts:
	z-project/GameLayer.mm