test
Merge branch 'master' of https://github.com/MattiasHammar/TDDD86-Labbar

Conflicts:
	wordchain/WordChain.pro.user