Should push to git repo on prod on successful merge to master
Merge pull request #4 from ewilson/travis

Should push to git repo on prod on successful merge to master
Merge branch 'master' of github.com:ewilson/titlematch_api

Conflicts:
	.travis.yml
	.travis/after_success.sh