change puzzle width and changed router for upload
Merge branch 'master' of https://github.com/rickvschalkwijk/rksmsm

Conflicts:
	client/css/default.css