.
.
implemented merge filtering
Fixed missing include
Added statistics about merges
Refined merge heuristic
Complex heuristic
Changed the way the different steps are performed. Now first perform movements, then merges
.
.
Merge branch 'dev' of https://github.com/ArnauPrat/triforce into dev

Conflicts:
	src/cover_utils.cpp
.