Fixed bug in E3D input file
Merge remote-tracking branch 'origin/master'

Conflicts:
	e3d_classes.py
	e3d_functions.py