Removed claim that GitHub public repositories are public licenced after rebuttal by Aron Ahmadia. Added link to the article he quoted.
Added the testing from the 2013-04-manchester bootcamp.
Added a title slide and some other minor changes.
Have made some very minor changes.
Added a link to an etherpad for use on the day.
Merge pull request #81 from marioa/2013-05-oxford-dtc

Number of small changes.
Added some notes on what the map and badges mean.
Added a small section on branching.
A number of small changes to the testing files.
Merge pull request #82 from marioa/2013-05-oxford-dtc

2013 05 oxford dtc
Merge branch '2013-05-oxford-dtc' of https://github.com/swcarpentry/boot-camps into 2013-05-oxford-dtc

Manually merged Welcome.ppt by adding the etherpad link to my version.