bbbb
cccc
test-Log
Merge branch 'TestBranch' of https://github.com/SuzukiYushin/ReformSimulator into new

Conflicts:
	test/test/TestViewController.m