premerge
Merge branch 'master' of https://github.com/blythfund/sentiment-analysis

Conflicts:
	.DS_Store