updated more content and styles on the academy landing page
updated more content and styles on the academy landing page
fixed a merge conflict and updated content on the FAQ page