"fack"
Merge branch 'master' of https://github.com/aymcky/numbrix

Conflicts:
	Desktop/numbrix.cpp