uncomment urls
after conflict
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/pysecl1/pyblog1
Merge branch 'master' of https://github.com/pysecl1/pyblog1
remove semicolon and parestheses
Merge branch 'master' of https://github.com/pysecl1/pyblog1
Merge branch 'master' of https://github.com/pysecl1/pyblog1