added smth
Merge remote-tracking branch 'origin/master'

Conflicts:
	objects/global_dictionary_word.py
added smth