pushing the rest of my work
Merge pull request #2 from micole/master

pushing the rest of my work