Change structure of atom names
Merge branch 'master' of github.com:FilipeMaia/spsim

Conflicts:
	src/molecule.c