Ignore KDiff3 output.
Added warmup for today.
Derp. Fixed echo to use single quotes.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'