Header and Footer
Merge branch 'master' of https://github.com/dsmitevaOOP/TeamProject