restructuring
Merge branch 'master' of https://github.com/TheChymera/faceOM

Conflicts:
	analysis/data_functions.py
	analysis/et.py