stuff
Merge branch 'Joe' of https://github.com/joemok/VisualStudioTest.git