lol
Merge branch 'master' of https://github.com/TetraWord/TetraWord

Conflicts:
	conf/myConf.properties