Added grid feature extractor

Merge branch 'master' of github.com:katiecanada/cs221Project

Conflicts:
	baseline.py
grid feature extraction