commit
mockup
Merge branch 'master' of https://github.com/eddywallyfan/nPuzzle10812806

Conflicts:
	doc/designdocument.md