travis changes
Merge branch 'master' of https://github.com/sangar82/Laravel-Starter

Conflicts:
	.travis.yml