starting from scratch
Merge branch 'master' of github.com:ilozinski/calc

Conflicts:
	Makefile
	calc