753e1ec Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
~jman pushed to ~jman/kanshi git
New git repository added