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

Conflicts:
	nbproject/private/private.xml
Modifications