merge with eric
continuing work on pagination
Merge branch 'master' of github.com:eatmorespinach/my_project