Edit files
Merge branch 'gh-pages' of https://github.com/kylemaclaren/test-project into gh-pages