modified:   Makefile
	modified:   calculate.cpp
	modified:   calculate.h
	new file:   moc_calculate.cpp
	new file:   superCalc.pro
Merge branch 'master' of https://github.com/glenfordwilliams/superCalc

fixed broken includes