implement sticky footer
Fix merge conflicts
Merge branch 'mattphoto-master'
Merge pull request #135 from polynickglot/master

Fix merge conflicts