adds travis
fix merge