-updating for camp subpages
Merge branch 'master' of https://github.com/Manifold0/salkehatchieB