added git stuff
 corrected the addition of basics
 corrected the addition of basics
 corrected the addition of basics
 corrected the addition of basics
 updates
 updates again
 updates again
Merge branch 'phil'