Version control using git
Merge remote-tracking branch 'NelleV/2013-06-southampton' into 2013-06-southampton

* NelleV/2013-06-southampton:
  Version control using git

On Sun, Jun 02, 2013 at 11:03:18AM -0700, Robin Wilson wrote:
> Ok - merging sounds good then. Could either @wking or @NelleV do the
> merge, as I don't have permissions.