added heroku path
Merge branch 'master' of github.com:pj4533/setupfiles

Conflicts:
	.gitconfig