Modified solver and ui
Merge branch 'master' of https://github.com/cyrildbravo/Repo1
Modified solver and ui
Merge pull request #4 from yssamarie/master

Modified solver and ui