add travis
resolve merge issue in readme.md