fixed conflict and added heinz ref 1
Merge branch 'master' of ssh://github.com/Safarikarel/PPNPReview

Conflicts:
	heavyion.bib