Merge branch 'master' of https://github.com/tyrbo/the_pivot
edits footer
Merge branch 'master' of https://github.com/tyrbo/the_pivot