memoryデザイン
Merge pull request #24 from cfiken/view

memoryデザイン
Merge branch 'master' into iroiro

Conflicts:
	Calculator/CalcViewController.m