Merge branch 'origin/jon'
updated main css: important
categories index.cshtml mainsite :important
Merge branch 'origin/ash'