created working version of getNearbyPhiPsi
resolved merge conflict
merge conflict resolution
Merge branch 'master' of github.com:ekwan/mandor

Conflicts:
	javadoc/FixedCompositionMonteCarloJob.FixedCompositionMonteCarloResult.html
	javadoc/IndexPairList.html
	javadoc/SidechainRotamerLibrary.BackboneAngles.html
	javadoc/SidechainRotamerLibrary.html