?
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