build footer in layout.erb
build footer in layout.erb
Merge remote-tracking branch 'upstream/master'