Added merging.
Fixed typos in merge section.
Added stuff about pulling. Next step, collaborative forking, pushing, pulling, and merging with conflicts. Yum.
Deleted yet-unconverted SVN content so that Robert can relax. Will convert it in parallel with the old content rather than over the top of the old content. Now, please relax.
Started an example on primes.
Got rid of SVN version, now confident we'll be teaching git.
Added second part of version control tutorial, on collaborative version control with github.
Renamed lesson2 to lesson2a.
Adds log command.
Added more on log command.
Merge branch 'master' of github.com:thehackerwithin/PyTrieste.wiki
Merge branch 'master' of github.com:thehackerwithin/PyTrieste.wiki
Fixed link in lesson2a. Fixed code examples in lesson2b
Added fetching.
Changed title.
More on fetching and merging. Soon, resolving conflicts.
Insisted pull before push
Created OO page.
Updated Python 6: Object oriented programming (markdown)
Copied starter text from Python2010