Update Samantha e-mail to FEM domain
Merge branch 'dev' of github.com:MPBA/nettools into dev