Merge branch 'master' of /home/sdc/IdeaProjects/LazyChemist with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Revert of Atom library

plus fixed module to LazyChemist