Fix conflicted files
Merge pull request #16 from mesosphere/multiple-executors

Fix conflicted files