In progress work, don't expect it to actually work though.
Merge branches 'master' and 'master' of https://github.com/DuChemin/MEIMassaging

Conflicts:
	massage/analyze/analyze.py
	massage/analyze/staff_info.py