attempt git push deploy on build
attempt git push deploy on build
Merge branch 'master' of github.com:adjohnson916/site

Conflicts:
	.travis.yml