Merge remote-tracking branch 'origin/master'

Conflicts:
run.py
modified:   .gitignore

.gitignore

@@ -55,3 +55,4 @@ docs/_build/
 
 # PyBuilder
 target/
+run.py

run.py

@@ -5,9 +5,19 @@ Example script
 """
 
 if __name__=='__main__':
+<<<<<<< HEAD
     url = 'http://www.ltsvet.ru/' # url from to crawl
     logfile = 'errlog.log' # path to logfile
     oformat = 'xml' # output format
     outputfile = '/srv/www/site/sitemap.xml' # path to output file
     crawl = pysitemap.Crawler(url=url, logfile=logfile, oformat=oformat, outputfile=outputfile)
-    crawl.crawl()
+    crawl.crawl()
+=======
+    url = 'http://www.example.ru/' # url from to crawl
+    logfile = 'errlog.log' # path to logfile
+    oformat = 'xml' # output format
+    crawl = pysitemap.Crawler(url=url, logfile=logfile, oformat=oformat)
+    print datetime.datetime.now()
+    crawl.crawl()
+    print datetime.datetime.now()
+>>>>>>> origin/master