cleaning2
Merge branch 'master' of https://github.com/rdaland/PhoMEnt

Conflicts:
	PhLearn_train_2.txt