?
Merge branch 'master' of https://github.com/opiumtea99/auto-found

Conflicts:
	tubular_calcs.pyc
Merge branch 'master' of https://github.com/opiumtea99/auto-found
committing home changes
if name == main at end
Merge branch 'master' of https://github.com/opiumtea99/auto-found

Conflicts:
	frequency.pyc
	jacket.py
working on fixing frequency calcs to include jacket