Merge branch 'master' of github.com:lc85301/FDTD

Conflicts:
	src/FDTD.cpp
	src/gnuplot_i.hpp
add magnitude to source function
Merge branch 'master' of github.com:lc85301/FDTD

Conflicts:
	src/gnuplot_i.hpp