wercker deploy
test commit
travis.yml を修正
Merge branch 'master' of heroku.com:morning-bastion-2096

Conflicts:
	README.md