new file:   .ipynb_checkpoints/wind_wtf-checkpoint.ipynb
	deleted:    .wind_comparison.py.swp
	new file:   .wind_comparison.py.un~
	new file:   assessor_extract.py
	modified:   wind_comparison.py
	modified:   wind_wtf.ipynb
Merge branch 'master' of github.com:mdbartos/misc

Conflicts:
	.ipynb_checkpoints/wind_wtf-checkpoint.ipynb
	wind_wtf.ipynb
	modified:   .wind_make.py.un~
	modified:   wind_make.py