travis test
Merge branch 'master' of github.com:rcaracaus/pledge-vegan-client

Conflicts:
	.travis.yml