added ant solver
Merged conflicts