changes made to reflect the change in website structure
Merge remote-tracking branch 'upstream/master'