added placeholders for volunteer, scholarships, registration confirmation, and cancellation
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

merging from upstream