finished front page
Merge branch 'frontendAC'