Cheat sheet added
Merge branch 'master' of https://github.com/colfraser/master