nicks attempts at last chance submissions
Merge branch 'master' of https://github.com/anassalamah/NLP-Project

Conflicts:
	linear regressor/merge_wiki_long_and_features_train.py