init
Merge branch 'master' of github.com:kyokomi/go-heroku-example

Conflicts:
	.gitignore