Commit before merging
Commit before merging2
 Merge after commit
Implemented LP solver, not 100% correct yet...