added second strategy
Merge remote-tracking branch 'origin/master'

Conflicts:
	handlers/global_dictionary_word_handlers.py
Merge branch 'master' of /home/ivan/thehat with conflicts.