Merge pull request #4 from mlund/master

merge
Nothing major
Merge branch 'master' of https://github.com/bjornstenqvist/faunus
Working Ion-Quadrupole
Merge pull request #5 from mlund/master

pull
Merge pull request #8 from bjornstenqvist/master

get quadrupoles