Initial commit
v58 Commit
v68 Commit
v74b4 Commit
Edited readme
did some more
James edited something
Merge branch 'test' of https://github.com/agnwinds/python into test

Nick did something and so did James. Nick's was was better so James fixed conflict to go with Nick's way.

Conflicts:
	README.md
Commented out NSHs print statement, added line in Readme
Edited wind_updates2d.c
Edited wind_updates2d.c changed to 0.2
Fixed conflict
Edited saha.c
Edited saha.c
Merge branch 'OtherPerson' into JM
Back to original version
Merge branch 'JM' into test
Added file to test mergers
JM made some changes in mergers test file
Other Person edited this