test commit from visual studio
Merge pull request #1 from marsmith/master

test commit from visual studio