Merge about

Merged guans work onto a separate branch to keep things clean, turns out there weren't *too* many conflicts :+1: great work @wangguan59!!! The page looks phenomenal!