commit
vulcan
Merge branch 'master' of heroku.com:new-one-test-her2

Conflicts:
	.gitignore
Merge branch 'master' of heroku.com:new-one-test-her2

Conflicts:
	.gitignore
Merge branch 'master' of heroku.com:new-one-test-her2

Conflicts:
	.gitignore