final version
final version
Merge branch 'master' of https://github.com/nataliamv/human_activity_recognition
ok