change folders
Merge remote-tracking branch 'origin/master'

Conflicts:
	pain.r
	textmining.R