Added heuristic that uses both OLL and BB.
Merge branch 'optimization' of https://github.com/alviano/wasp into optimization