Merge branch 'master' of github.com:t0marr0w/dictionary

Conflicts:
	dictionary_array.cpp
Merge branch 'master' of github.com:t0marr0w/dictionary

Conflicts:
	dictionary_array.cpp