more const yay
Merge branch 'master' into cross

Conflicts:
	Puzzle.cpp