fixing git
Merge branch 'nathan/subpage' of github.com:nathandodds/git-testing into nathan/subpage