front page update
fixed merge, adding new front page content