Sticky footer

Thanks to http://mystrd.at/data/sticky_footer.html
resolve merge conflict
Merge branch 'master' of https://github.com/andrew/24pullrequests