initial gritty deadspace prevention
Merge branch 'supermaster' of https://github.com/bruteforce-kth/skynet into supermaster

Conflicts:
	solver.cpp