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

Conflicts:
	src/FDTD.cpp