メニューに画像を出してみた
Merge branch 'master' of https://github.com/fujitaya/Zunko

Conflicts:
	app/src/main/java/jp/fujitaya/zunko/SceneMenu.java
	app/src/main/java/jp/fujitaya/zunko/util/GameView.java
Merge branch 'master' of https://github.com/fujitaya/Zunko

Conflicts:
	app/src/main/java/jp/fujitaya/zunko/SceneMenu.java
	app/src/main/java/jp/fujitaya/zunko/util/GameView.java