fixed merge conflicts
Revert "fixed main". someone deleted beamsearch from master.

This reverts commit 6dcc43624628e49b86f898c2e262f696095fc62b.

Conflicts:
	updated/local_search.py
	updated/main.py
fixed merge comflict
fixed merge comflict
fixed merge comflict
Revert "fixed merge conflicts"

This reverts commit 348df55bf24d2d0c043a2aafc6196c040dfb6b28.

Conflicts:
	updated/local_search.py
	updated/main.py
Revert "fixed merge conflicts"

This reverts commit 348df55bf24d2d0c043a2aafc6196c040dfb6b28.

Conflicts:
	updated/local_search.py
	updated/main.py
...
Beam search done
including SA in tests in main