merge on pdb file reader ?
Merge branch 'master' of https://github.com/galicae/tina.git

Conflicts:
	src/bioinfo/proteins/PDBFileReader.java