added a new html file
fixed the broken email
finished the new footer
conflict is solved