added jens work
Merge pull request #32 from githubteacher/jenniferjshin

added more stuff