"About us" page added
Move pages to subfolders so that they're indexes
Merge remote-tracking branch 'origin/master' into design