quikcly, add stuff

Signed-off-by: Andrew Tselischev <andrewtselischev@gmail.com>
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'farlander/master'

//farlander/master INTO github/master
//I wish i could figure out a way to do the opposite, merge
//github/master INTO farlander/master. Unless it's not possible,
//in which case I officially don't know how to git.