modified header footer
final header & footer
merged header footer with master