first commit
Merge branch 'master' of github.com:fangfufu/CheapCalculator

Conflicts:
	.gitignore