commiting before checking out
Merge branch 'dev' of https://github.com/rmari/LF_DEM_viewer into dev

Conflicts:
	src/draw.py
	src/omerFile.py
Adding possibility to give a prefactor number to some functions