kjjkllk
Merge branch 'master' of https://github.com/jjuang/Calculator

Conflicts:
	.DS_Store
	Calculator/en.lproj/MainStoryboard.storyboard
stuff