Test push to heroku only for the master branch
Merge branch 'develop' of https://github.com/tstehle/raccoonia

Conflicts:
	.travis.yml