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

Conflicts:
	src/FDTD.cpp
	src/mesh.cpp
	src/mesh.h
Merge branch 'master' of github.com:lc85301/FDTD