q43wse5trdyt
Merge remote-tracking branch 'origin/master'

Conflicts:
	wordchain/WordChain.pro
	wordchain/src/wordchain.cpp