swear changes
Merge branch 'python' of https://github.com/claragordon/SentimentAspect into python

Conflicts:
	mallet_files/test
	mallet_files/train