Deadlock patterns update
Merge branch 'master' of https://github.com/milseman/sokoban.git
Added a heuristic that uses bi matching and save positions
Updated bimatch with save pos
Merge branch 'master' of https://github.com/milseman/sokoban.git

Conflicts:
	src/ai/sokoban/Main.java
	src/ai/sokoban/Settings.java