local changes
Merge branch 'master' of https://github.com/lk16/squared

Conflicts:
	src/game/board.hpp