Codeboo
Merge branch 'master' of https://github.com/boofhead/HumanActivity

Conflicts:
	UCI HAR Dataset/features_info.txt