Update Preparing-for-Settlement-steps1-2.html
Update Preparing-for-settlement-step3.html
Update SettlementConference.html
Merge pull request #158 from SUNY-Albany-CCI-INF362/nataliapitts

Nataliapitts
Merge pull request #159 from SUNY-Albany-CCI-INF362/master

nataliapitts