Conflict resolution

resolving conflicts in order to merge pull request
Merge pull request #6 from OpenDevelopmentMekong/mishari-implement-travis

Conflict resolution