uses git fetch and reset instead of pull (reset instead of merge as
was pointed out here http://marc.info/?l=git&m=121637513604413&w=2)
gitignore added