Cleanup
Merge branch 'master' of https://github.com/grothered/RiverNet

Conflicts:
	network_solver.f03
Cleaning up main.f03
Small changes
Small updates
Moving towards junctions
Nearly fixed, needs cleaning
leaning up junction
Almost
IN progress -- need to figure out how to stick junction boundary info on
Minor changes