initial commit
Merge branch 'master' of github.com:hezuo/calculator

Conflicts:
	.gitignore