Reconciling thermodynamic and state definitions of entropy

Reconciling thermodynamic and state definitions of entropy