Diana adding part 2 of assignment 1
Merge pull request #23 from dfnews/master

Diana adding part 2 of assignment 1