setting up travis
setting up travis
added travis support
added travis support
merge conflict fix