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

Conflicts:
	hrl_anomaly_detection/src/hrl_anomaly_detection/HMM/learning_hmm.py
	modified:   learning_hmm.py