changesOct092014

not final yet
16Oct2014

Assignment
Merge pull request #33 from chaugirl/master

Assignment for week 4