Added Travis config.
Fixed conflict in .travis.yml.

Conflicts:
	.travis.yml