stuff and things
Fixed merge
Merge pull request #6 from micole/stuff

Stuff