cleanup, merge, reorganise
Merge branch 'master' of github.com:donjan/compelectromag