refactored
Merge branch 'master' of https://github.com/nityas/6869-finalproject
added cnn
added 2D features
moved hog files to data2 directory
Merge branch 'master' of https://github.com/nityas/6869-finalproject

Conflicts:
	src/data/hog_testing_data.npy
	src/data/hog_testing_labels.npy
	src/data/hog_training_data.npy
	src/data/hog_training_labels.npy
	src/logreg.py