added frontpage
fixed merge