Update Makefile a little bit and update the colormap class
Merge branch 'master' of https://github.com/xinanxu/cFDTD.git