adding travis file
merge