i think this was supposed to be a comment
Merge pull request #1 from nicolassmith/master

I think this was supposed to be a comment