merge
merged
Merge branch 'master' of https://github.com/wkodate/Anrakutei.git

Conflicts:
	src/com/Ichif1205/anrakutei/FieldSurfaceView.java