fgg
Merge branch 'master' of ssh://git@github.com/astray0924/samsung_2nd_module_java.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	src/main/java/samsung_sentiment_module/sentiment/SentimentPipeline.java