To be merge local version
Merge branch 'master' of github.com:lc85301/FDTD

Conflicts:
	src/Makefile
	src/solver.cu
add license