Updated git cheat sheet.
Merge branch 'alan'