a
とりま
まーじ
Merge branch 'gziptest'

Conflicts:
	src/norites/Main.java