removed unmerged conflic
Merge branch 'master' of https://github.com/czepluch/MiL