Add a basic README (closes #25)
Merge remote-tracking branch 'upstream/master'