Norm told me to say this is my first commit...
Merge branch 'master' of https://github.com/nickredmond/nredmondCapstone