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

Conflicts:
	server/server.js
resolve
give up