made a change
made other changes
added index.html
finished new footer
master index edited
merged