Some fixes to last merge
Some fixes to last merge
jeremiahyan/codecombat,jacobakkerboom/codecombat,anirudhnr2015/codecombat,khoa102/codecombat,cundamic/codecombat,leendek/codecombat,pooky-lin/codecombat,q1ang/codecombat,TeodorMihai/codecombat,hujianfei1989/codecombat,rohmunhoz/codecombat,fabichoi/codecombat,Akhuta/codecombat,yapkn/codecombat,wgsu/codecombat,icodegame/codecombat,duybkict/codecombat,ecemm/codecombat,jumarko/codecombat,Minhir/codecombat,tuomastanner/codecombat,lasershow/codecombat,ReturntoZero/codecombat,Zacharias030/codecombat,Cooky8197/codecombat,kidaa/codecombat,Fokusnica/codecombat,pooky-lin/codecombat,Minhir/codecombat,bsmr-x-script/codecombat,Ikuyadeu/codecombat,wangjun/codecombat,aashaka/codecombat,GraysonP/codecombat-1,anirudhnr2015/codecombat,jhoon/codecombat,chooowai/codecombat,Fokusnica/codecombat,bkiehl/lol,rao1219/codecombat,khoa102/codecombat,anonymousch/codecombat,EmbraceLife/codecombat,abhisekp/codecombat,s2prod/codecombat,khoa102/codecombat,Layle77/codecombat,Minhir/codecombat,wangjun/codecombat,laituan245/codecombat,wolut/codecombat,cundamic/codecombat,zhangxiuquan/codecombat,feifacz/codecombat,Driphter/codecombat,weevilgenius/codecombat,EmbraceLife/codecombat,TsubameDono/codecombat,jumarko/codecombat,wanchouchou/codecombat,sarahjean/codecombat,laituan245/codecombat,askeing/codecombat,nullsquid/codecombat,jacobakkerboom/codecombat,Layle77/codecombat,giaba90/codecombat,SephVelut/codecombat,giaba90/codecombat,Driphter/codecombat,Cooky8197/codecombat,ecemm/codecombat,teffy/codecombat,slacker88/codecombat,sarahjean/codecombat,ReturntoZero/codecombat,pougounias/codecombat,sarahjean/codecombat,nullsquid/codecombat,zuihun/codecombat,yapkn/codecombat,jhoon/codecombat,wanchouchou/codecombat,weevilgenius/codecombat,codecombat/codecombat,cherub0526/codecombat,dyhpoon/codecombat,feifacz/codecombat,codecombat/codecombat,VilkkuV/codecombat,tcxhxx/codecombat,Akhuta/codecombat,askeing/codecombat,kumabotz/codecombat,geekchy/codecombat,bsmr-x-script/codecombat,zhangxiuquan/codecombat,lasershow/codecombat,Diprm77/codecombat,jacobakkerboom/CodeCombat2,jhoon/codecombat,codecombat/codecombat,cherub0526/codecombat,dboyliao/codecombat,jequal/codecombat,nullsquid/codecombat,weevilgenius/codecombat,The-Alchemist/codecombat,yapkn/codecombat,Zacharias030/codecombat,teresacream/codecombat,jequal/codecombat,AkaKaras/codecombat,wanchouchou/codecombat,teresacream/codecombat,nimda7/codecombat,Ye-Yong-Chi/codecombat,anonymousch/codecombat,Akhuta/codecombat,PatrickShelby/codecombat,UltCombo/codecombat,icodegame/codecombat,ilo/codecombat,feifacz/codecombat,aashaka/codecombat,teresacream/codecombat,fabichoi/codecombat,jacobakkerboom/CodeCombat2,ReturntoZero/codecombat,codecombat/codecombat,Diprm77/codecombat,nullsquid/codecombat,pougounias/codecombat,bkiehl/lol,mnogi/codecombat,amit2103/codecombat,lasershow/codecombat,trotod/codecombat,fabichoi/codecombat,weevilgenius/codecombat,SephVelut/codecombat,amit2103/codecombat,kumabotz/codecombat,thejdeep/codecombat,trotod/codecombat,TsubameDono/codecombat,fabichoi/codecombat,leendek/codecombat,kidaa/codecombat,aashaka/codecombat,Ye-Yong-Chi/codecombat,abhisekp/codecombat,leendek/codecombat,eschuler21/codecombat,anonymousch/codecombat,PatrickShelby/codecombat,geekchy/codecombat,rohmunhoz/codecombat,jeremiahyan/codecombat,jeremyprice/codecombat,wangjun/codecombat,ycaihua/codecombat,wolut/codecombat,Akhuta/codecombat,zuihun/codecombat,kidaa/codecombat,teffy/codecombat,AlanHohn/codecombat,Ye-Yong-Chi/codecombat,AlanHohn/codecombat,Driphter/codecombat,Zerrien/codecombat,teffy/codecombat,duybkict/codecombat,rohmunhoz/codecombat,AlanHohn/codecombat,yapkn/codecombat,askeing/codecombat,bkiehl/lol,amit2103/codecombat,mads232/codecombat,geekchy/codecombat,nimda7/codecombat,pooky-lin/codecombat,thejdeep/codecombat,ilo/codecombat,mads232/codecombat,probil/codecombat,javatlacati/codecombat,edtrist/codecombat,JordanLittell/codecombat,icodegame/codecombat,wolut/codecombat,s2prod/codecombat,GraysonP/codecombat-1,s2prod/codecombat,dboyliao/codecombat,jacobakkerboom/codecombat,bkiehl/lol,Driphter/codecombat,MonkStrom/codecombat,GraysonP/codecombat-1,tpai/codecombat,q1ang/codecombat,AkaKaras/codecombat,pougounias/codecombat,tuomastanner/codecombat,tcxhxx/codecombat,cundamic/codecombat,thejdeep/codecombat,EmbraceLife/codecombat,tpai/codecombat,wangjun/codecombat,slacker88/codecombat,probil/codecombat,Cooky8197/codecombat,eschuler21/codecombat,rao1219/codecombat,mnogi/codecombat,Zerrien/codecombat,anirudhnr2015/codecombat,TeodorMihai/codecombat,cherub0526/codecombat,feifacz/codecombat,Layle77/codecombat,MonkStrom/codecombat,jeremyprice/codecombat,slacker88/codecombat,jacobakkerboom/CodeCombat2,abhisekp/codecombat,differentmatt/codecombat,tcxhxx/codecombat,MonkStrom/codecombat,Ikuyadeu/codecombat,TeodorMihai/codecombat,ycaihua/codecombat,Diprm77/codecombat,PatrickShelby/codecombat,dyhpoon/codecombat,Layle77/codecombat,justinleoye/codecombat,The-Alchemist/codecombat,jumarko/codecombat,ReturntoZero/codecombat,ingedmundo/codecombat,Minhir/codecombat,aashaka/codecombat,edtrist/codecombat,teffy/codecombat,rao1219/codecombat,UltCombo/codecombat,VilkkuV/codecombat,AkaKaras/codecombat,wgsu/codecombat,wgsu/codecombat,ecemm/codecombat,differentmatt/codecombat,dyhpoon/codecombat,khoa102/codecombat,s2prod/codecombat,dboyliao/codecombat,mnogi/codecombat,Ikuyadeu/codecombat,EmbraceLife/codecombat,rohmunhoz/codecombat,nixel2007/codecombat,jacobakkerboom/codecombat,Fokusnica/codecombat,eschuler21/codecombat,javatlacati/codecombat,Ye-Yong-Chi/codecombat,tcxhxx/codecombat,Zacharias030/codecombat,q1ang/codecombat,zuihun/codecombat,nimda7/codecombat,justinleoye/codecombat,laituan245/codecombat,probil/codecombat,cherub0526/codecombat,jeremyprice/codecombat,UltCombo/codecombat,differentmatt/codecombat,zuihun/codecombat,ecemm/codecombat,teresacream/codecombat,PatrickShelby/codecombat,codecombat/codecombat,ilo/codecombat,chooowai/codecombat,slacker88/codecombat,ilo/codecombat,kumabotz/codecombat,kumabotz/codecombat,zhangxiuquan/codecombat,sarahjean/codecombat,probil/codecombat,TsubameDono/codecombat,jeremiahyan/codecombat,Fokusnica/codecombat,UltCombo/codecombat,nixel2007/codecombat,trotod/codecombat,ycaihua/codecombat,dyhpoon/codecombat,icodegame/codecombat,ingedmundo/codecombat,giaba90/codecombat,amit2103/codecombat,mnogi/codecombat,Diprm77/codecombat,AkaKaras/codecombat,tpai/codecombat,hujianfei1989/codecombat,edtrist/codecombat,jumarko/codecombat,SephVelut/codecombat,duybkict/codecombat,Cooky8197/codecombat,VilkkuV/codecombat,jacobakkerboom/CodeCombat2,kidaa/codecombat,hujianfei1989/codecombat,javatlacati/codecombat,chooowai/codecombat,pooky-lin/codecombat,MonkStrom/codecombat,nimda7/codecombat,ingedmundo/codecombat,askeing/codecombat,JordanLittell/codecombat,justinleoye/codecombat,laituan245/codecombat,The-Alchemist/codecombat,nixel2007/codecombat,tuomastanner/codecombat,ycaihua/codecombat,cundamic/codecombat,The-Alchemist/codecombat,jequal/codecombat,giaba90/codecombat,thejdeep/codecombat,wgsu/codecombat,justinleoye/codecombat,SephVelut/codecombat,differentmatt/codecombat,bsmr-x-script/codecombat,anonymousch/codecombat,wanchouchou/codecombat,javatlacati/codecombat,AlanHohn/codecombat,tpai/codecombat,jequal/codecombat,mads232/codecombat,hujianfei1989/codecombat,jeremyprice/codecombat,VilkkuV/codecombat,chooowai/codecombat,javatlacati/codecombat,nixel2007/codecombat,bsmr-x-script/codecombat,wolut/codecombat,TsubameDono/codecombat,Zerrien/codecombat,edtrist/codecombat,Ikuyadeu/codecombat,ingedmundo/codecombat,geekchy/codecombat,jhoon/codecombat,Zerrien/codecombat,rao1219/codecombat,JordanLittell/codecombat,mads232/codecombat,trotod/codecombat,GraysonP/codecombat-1,dboyliao/codecombat,zhangxiuquan/codecombat,JordanLittell/codecombat,anirudhnr2015/codecombat,eschuler21/codecombat,pougounias/codecombat,abhisekp/codecombat,leendek/codecombat,Zacharias030/codecombat,TeodorMihai/codecombat,tuomastanner/codecombat,q1ang/codecombat,lasershow/codecombat,duybkict/codecombat,jeremiahyan/codecombat