this is it
Merge branch 'master' of github.com:geosanders/Calcu

Conflicts:
	test.txt