Added matterfab to gtcalc
Merge branch 'master' of github.com:ras0219/hsmc

Conflicts:
	gtcalculator.hs