m
Merge branch 'master' of https://github.com/xumx/magic-square

Conflicts:
	grid.js