ttt
before merge

Merge branch 'master' of https://github.com/3ki5tj/rism

Conflicts:
	prog/rism0.c