Fix feature labels
Merge branch 'master' of https://github.com/linuxfranz/getdata_project

Conflicts:
	run_analysis.R