commit to merge
fixed merge conflicts
fixed pic.m on work computer
added energy and particle number vectors for considering linearisation