gitignore modified
resolved conflict
Merge pull request #4 from oma-vrptw/origin/master

Origin/master