added travis
merge