Code

Merge branch 'jk/git-tricks'