starting over again
Merge branch 'master' of github.com:jose-mr/qt_scripts

Conflicts:
	modules/gaussian.py