init setup
added text
Merge branch 'master' of https://github.com/josieh/class02
fixing steven's mistakes