fixed merge problem
Merge branch 'master' of https://github.com/Ardnived/ApeMaze

Conflicts:
	client/board.js