novo
Merge branch 'master' of https://github.com/spule/fem_lsm_v01

Conflicts:
	exa/preprocess.py