changes
Merge branch 'multimodal' of https://github.com/thenghiapham/w2vcomp
into multimodal

Conflicts:
	w2vcomp/src/demo/TestConstants.java