changed some stuff
update
Merge branch 'master' of github.com:michellechen-/Period-3-Final-Michelle-Andrew-David