disp関数変更issue#1対応
Merge pull request #3 from tpgscm/issue#2

Issue#2
issue#1 の修正途中コミット
disp関数変更issue#1対応
issue#1 の修正途中コミット
Merge branch 'issue#1' of https://github.com/tpgscm/PS3 into issue#1
Merge pull request #4 from tpgscm/issue#1

Issue#1のリリース
Merge branch 'se14-001' into issue#2

Conflicts:
	screen.cpp