commenting out line opening Zach s file in 8icmw_case1_1800s_sdm_vs_2dbin/plot.cpp
fixing conflict
sync on granda
Merge remote-tracking branch 'upstream/master'

Conflicts:
	examples/8icmw_case1/test_todo_plot.cpp
	tests/todo/test_todo_calc.cpp
sync with laptop
adding missing CMakeLists.txt file
fix
sync
sync
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CMakeLists.txt
	examples/8icmw_case1_1800s_sdm_vs_2dbin/calc.cpp
	examples/8icmw_case1_1800s_sdm_vs_2dbin/plot.cpp
Merge github.com:trontrytel/icicle

Conflicts:
	examples/8icmw_case1/test_todo_calc.cpp
add chem