fixed broken gaus function (not gaus2)
Merge remote-tracking branch 'origin/master'

Conflicts:
	gptempdata.py