created footer
merget branch footer resolved conflict