commit on foo
Merge pull request #1 from chriskottom/foo

Pull request from foo