initial commit
Merge github.com:sn0cr/calculator

Conflicts:
	.gitignore