abc
Merge branch 'master' of github.com:naibaf7/LinguaAdHoc

Conflicts:
	Dictionary/src/ch/smartapes/linguaadhoc/dictionary/Classify.java