data_obj, hysteresis additions
data_obj, hysteresis additions
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/RockPy.iml
	Measurements/hysteresis.py
	Structure/rockpydata.py
gitignore added