update
Merge branch 'master' of https://github.com/shawnknight/test_project

Conflicts:
.travis.yml
Merge branch 'master' of https://github.com/shawnknight/test_project

Conflicts:
	.travis.yml