modified:   data_prep/.wind.py.un~
	modified:   data_prep/wind.py
	modified:   post/.ipynb_checkpoints/post_plot-checkpoint.ipynb
	new file:   post/post_plot-Copy0.ipynb
	modified:   post/post_plot.ipynb
	new file:   post/prep_post_plot_d.py
Merge branch 'master' of github.com:mdbartos/vic_utils

Conflicts:
	data_prep/.wind.py.un~