update

Conflicts:
	.travis.yml