modified:   test_anomaly_door_opening.py
Merge branch 'master' of https://github.com/gt-ros-pkg/hrl-assistive

Conflicts:
	hrl_anomaly_detection/src/hrl_anomaly_detection/HMM/test_anomaly_door_opening.py

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
	modified:   test_anomaly_door_opening.py