Linked homepage categories to their pages
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Integrated horizontal template