teest

teest
footer modifications
resolved conflict