Commented out NSHs print statement, added line in Readme
Edited wind_updates2d.c changed to 0.2
Fixed conflict