Added "(super hip and cool)" gitk
Merge branch 'master' into vertigo