added: gitignore
bugfix: calculation of local energy
merge-conflicts
added: Makefile plus some small stuff
bugfix: important for proper results!
save changes for push