Added a footer
Update homepage
intros for each page
Resolved conflict with master