fix conflict
Merge branch 'master' of github.com:pysecl1/pyblog1
add paginator