Feature data generation
label data
data
fixing
Merge branch 'master' of https://github.com/adamwgoldberg/CS-229-Final-Project

Conflicts:
	generate_features.m