ボタンデザイン等再調整２
Merge branch 'view' of github.com:cfiken/calculator into view

Conflicts:
	Calculator.xcodeproj/project.pbxproj
	Calculator/Base.lproj/Main.storyboard
	Calculator/Images.xcassets/images/Button/Button_+.imageset/Button_+@2x.png
	Calculator/Images.xcassets/images/Button/Button_-.imageset/Button_-@2x.png
	Calculator/Images.xcassets/images/Button/Button_2.imageset/Button_2@2x.png
	Calculator/Images.xcassets/images/Button/Button_6.imageset/Button_6@2x.png
	Calculator/Images.xcassets/images/Button/Button_7.imageset/Button_7@2x.png
	Calculator/Images.xcassets/images/Button/Button_=.imageset/Button_=@2x.png
	Calculator/Images.xcassets/images/Button/Button_C.imageset/Button_C@2x.png
	Calculator/Images.xcassets/images/Button/Button_dot.imageset/Button_dot@2x.png
	Calculator/Images.xcassets/images/Button/Button_kakeru.imageset/Button_kakeru@2x.png
	Calculator/Images.xcassets/images/Button/Button_pasen.imageset/Button_pasen@2x.png
	Calculator/Images.xcassets/images/Button/Button_puramai.imageset/Button_puramai@2x.png
	Calculator/Images.xcassets/images/Button/Button_waru.imageset/Button_waru@2x.png
	Calculator/Images.xcassets/input.imageset/input@2x.png
Merge branch 'view' of github.com:cfiken/calculator into view
Merge pull request #50 from cfiken/view

View