before merge
Merge remote-tracking branch 'origin1/master'

add links to footer