merge bmizerany/master
merge bmizerany/master

JonMidhir/sinatra,RosenDimov/sinatra,Rayheng/sinatra,sethuster/sinatra,defsprite/sinatra,QLGu/sinatra,jkowens/sinatra,sinatra/sinatra,jenalgit/sinatra,guidohcosta/sinatra,dariubs/sinatra,howtolearntocode/sinatra,porras/sinatra,JonRowe/sinatra,ksw2599/sinatra,blambeau/sinatra,frechei/sinatra,eileencodes/sinatra,kumji/sinatra,twanies/sinatra,QLGu/sinatra,howtolearntocode/sinatra,Wirachmat/sinatra,Wirachmat/sinatra,kyontan/sinatra,Callygraphy/morrissey,ganmacs/sinatra,laplaceliu/sinatra,emiliocorpus/sinatra,kgrz/sinatra,mwpastore/sinatra,d-bot/sinatra,ksw2599/sinatra,nicoayala/sinatra,DoraALin/sinatra,porras/sinatra,mwpastore/sinatra,ganmacs/sinatra,ryanshaw/sinatra,laplaceliu/sinatra,gferguson-gd/sinatra,cyberid41/sinatra,trexnix/sinatra,ABaldwinHunter/sinatra-classic,trexnix/sinatra,ryanshaw/sinatra,gferguson-gd/sinatra,miyazawatomoka/sinatra,midorineko/sinatra,sethuster/sinatra,lastcat/sinatra,guidohcosta/sinatra,davydovanton/sinatra,ktw1222/sinatra,autopp/sinatra,lastcat/sinatra,JonMidhir/sinatra,DoraALin/sinatra,frechei/sinatra,nottombrown/old-sinatra,ktw1222/sinatra,ABaldwinHunter/sinatra-classic,siberianbear/sinatra,eileencodes/sinatra,jenalgit/sinatra,JonMidhir/sinatra,nottombrown/old-sinatra,RosenDimov/sinatra,emiliocorpus/sinatra,nju520/sinatra,midorineko/sinatra,Rayheng/sinatra,jkowens/sinatra,dariubs/sinatra,burningTyger/sinatra,sinatra/sinatra,bmizerany/sinatra,nicoayala/sinatra,defsprite/sinatra,kumji/sinatra,burningTyger/sinatra,davydovanton/sinatra,burningTyger/sinatra,mwpastore/sinatra,wzheng1/sinatra,autopp/sinatra,JonRowe/sinatra,d-bot/sinatra,twanies/sinatra,marocchino/sinatra,jkowens/sinatra,siberianbear/sinatra,wzheng1/sinatra,kyontan/sinatra,nju520/sinatra,cyberid41/sinatra,miyazawatomoka/sinatra