stage 6

putting in more content for settlement conference 3
Merge pull request #220 from SUNY-Albany-CCI-INF362/stage6

stage 6