Fixed some mistakes in last merge
Fixed some mistakes in last merge
GraysonP/codecombat-1,duybkict/codecombat,aashaka/codecombat,Ye-Yong-Chi/codecombat,teresacream/codecombat,anonymousch/codecombat,khoa102/codecombat,probil/codecombat,tcxhxx/codecombat,laituan245/codecombat,UltCombo/codecombat,trotod/codecombat,differentmatt/codecombat,The-Alchemist/codecombat,trotod/codecombat,bsmr-x-script/codecombat,UltCombo/codecombat,codecombat/codecombat,eschuler21/codecombat,GraysonP/codecombat-1,ecemm/codecombat,javatlacati/codecombat,dyhpoon/codecombat,icodegame/codecombat,VilkkuV/codecombat,Cooky8197/codecombat,mads232/codecombat,wgsu/codecombat,Layle77/codecombat,ingedmundo/codecombat,icodegame/codecombat,jacobakkerboom/codecombat,The-Alchemist/codecombat,JordanLittell/codecombat,EmbraceLife/codecombat,icodegame/codecombat,wolut/codecombat,Zerrien/codecombat,anirudhnr2015/codecombat,Fokusnica/codecombat,ecemm/codecombat,zhangxiuquan/codecombat,Minhir/codecombat,Layle77/codecombat,TeodorMihai/codecombat,eschuler21/codecombat,mnogi/codecombat,aashaka/codecombat,ingedmundo/codecombat,ReturntoZero/codecombat,ReturntoZero/codecombat,GraysonP/codecombat-1,Driphter/codecombat,mnogi/codecombat,ecemm/codecombat,geekchy/codecombat,nullsquid/codecombat,weevilgenius/codecombat,wangjun/codecombat,Akhuta/codecombat,nixel2007/codecombat,MonkStrom/codecombat,weevilgenius/codecombat,weevilgenius/codecombat,SephVelut/codecombat,pooky-lin/codecombat,anirudhnr2015/codecombat,MonkStrom/codecombat,jhoon/codecombat,abhisekp/codecombat,bsmr-x-script/codecombat,codecombat/codecombat,Zerrien/codecombat,VilkkuV/codecombat,Cooky8197/codecombat,edtrist/codecombat,jacobakkerboom/codecombat,ilo/codecombat,pooky-lin/codecombat,askeing/codecombat,askeing/codecombat,PatrickShelby/codecombat,jhoon/codecombat,rao1219/codecombat,tpai/codecombat,The-Alchemist/codecombat,sarahjean/codecombat,nullsquid/codecombat,Minhir/codecombat,khoa102/codecombat,kidaa/codecombat,differentmatt/codecombat,jeremiahyan/codecombat,jeremyprice/codecombat,Fokusnica/codecombat,zuihun/codecombat,PatrickShelby/codecombat,JordanLittell/codecombat,ilo/codecombat,Fokusnica/codecombat,yapkn/codecombat,wangjun/codecombat,Diprm77/codecombat,nimda7/codecombat,Fokusnica/codecombat,VilkkuV/codecombat,javatlacati/codecombat,AkaKaras/codecombat,tuomastanner/codecombat,fabichoi/codecombat,dyhpoon/codecombat,fabichoi/codecombat,anirudhnr2015/codecombat,yapkn/codecombat,giaba90/codecombat,rao1219/codecombat,khoa102/codecombat,ReturntoZero/codecombat,kumabotz/codecombat,giaba90/codecombat,Zacharias030/codecombat,rao1219/codecombat,JordanLittell/codecombat,bsmr-x-script/codecombat,s2prod/codecombat,kumabotz/codecombat,ecemm/codecombat,jeremiahyan/codecombat,jacobakkerboom/codecombat,jhoon/codecombat,Minhir/codecombat,anonymousch/codecombat,bsmr-x-script/codecombat,ReturntoZero/codecombat,s2prod/codecombat,yapkn/codecombat,jumarko/codecombat,PatrickShelby/codecombat,aashaka/codecombat,zuihun/codecombat,khoa102/codecombat,ilo/codecombat,Driphter/codecombat,sarahjean/codecombat,ilo/codecombat,ingedmundo/codecombat,kumabotz/codecombat,codecombat/codecombat,The-Alchemist/codecombat,yapkn/codecombat,differentmatt/codecombat,zhangxiuquan/codecombat,Driphter/codecombat,tuomastanner/codecombat,q1ang/codecombat,edtrist/codecombat,dyhpoon/codecombat,SephVelut/codecombat,Diprm77/codecombat,Ye-Yong-Chi/codecombat,Cooky8197/codecombat,MonkStrom/codecombat,duybkict/codecombat,feifacz/codecombat,tcxhxx/codecombat,sarahjean/codecombat,Driphter/codecombat,aashaka/codecombat,nimda7/codecombat,duybkict/codecombat,geekchy/codecombat,Layle77/codecombat,hujianfei1989/codecombat,Zacharias030/codecombat,EmbraceLife/codecombat,wangjun/codecombat,abhisekp/codecombat,edtrist/codecombat,wolut/codecombat,AkaKaras/codecombat,Ye-Yong-Chi/codecombat,edtrist/codecombat,tpai/codecombat,TeodorMihai/codecombat,GraysonP/codecombat-1,UltCombo/codecombat,Diprm77/codecombat,differentmatt/codecombat,jeremiahyan/codecombat,Diprm77/codecombat,dyhpoon/codecombat,codecombat/codecombat,SephVelut/codecombat,duybkict/codecombat,tuomastanner/codecombat,Akhuta/codecombat,s2prod/codecombat,wgsu/codecombat,nixel2007/codecombat,anonymousch/codecombat,jeremyprice/codecombat,javatlacati/codecombat,Minhir/codecombat,q1ang/codecombat,tcxhxx/codecombat,nimda7/codecombat,amit2103/codecombat,pooky-lin/codecombat,EmbraceLife/codecombat,mads232/codecombat,jumarko/codecombat,cherub0526/codecombat,dboyliao/codecombat,Cooky8197/codecombat,probil/codecombat,askeing/codecombat,teresacream/codecombat,laituan245/codecombat,tcxhxx/codecombat,kidaa/codecombat,teresacream/codecombat,feifacz/codecombat,q1ang/codecombat,tpai/codecombat,giaba90/codecombat,teresacream/codecombat,laituan245/codecombat,cherub0526/codecombat,jumarko/codecombat,icodegame/codecombat,wgsu/codecombat,javatlacati/codecombat,jeremyprice/codecombat,VilkkuV/codecombat,abhisekp/codecombat,sarahjean/codecombat,Zerrien/codecombat,hujianfei1989/codecombat,nixel2007/codecombat,jacobakkerboom/codecombat,trotod/codecombat,hujianfei1989/codecombat,kidaa/codecombat,hujianfei1989/codecombat,probil/codecombat,Zacharias030/codecombat,tpai/codecombat,mads232/codecombat,anonymousch/codecombat,zhangxiuquan/codecombat,wgsu/codecombat,kumabotz/codecombat,anirudhnr2015/codecombat,wangjun/codecombat,SephVelut/codecombat,Zacharias030/codecombat,zuihun/codecombat,dboyliao/codecombat,fabichoi/codecombat,JordanLittell/codecombat,mnogi/codecombat,geekchy/codecombat,zuihun/codecombat,s2prod/codecombat,Akhuta/codecombat,codecombat/codecombat,PatrickShelby/codecombat,nullsquid/codecombat,probil/codecombat,AkaKaras/codecombat,Layle77/codecombat,laituan245/codecombat,TeodorMihai/codecombat,geekchy/codecombat,mnogi/codecombat,cherub0526/codecombat,kidaa/codecombat,nullsquid/codecombat,jumarko/codecombat,abhisekp/codecombat,wolut/codecombat,Ye-Yong-Chi/codecombat,tuomastanner/codecombat,jeremiahyan/codecombat,Zerrien/codecombat,askeing/codecombat,pooky-lin/codecombat,jhoon/codecombat,q1ang/codecombat,Akhuta/codecombat,ingedmundo/codecombat,cherub0526/codecombat,amit2103/codecombat,AkaKaras/codecombat,mads232/codecombat,feifacz/codecombat,eschuler21/codecombat,dboyliao/codecombat,feifacz/codecombat,MonkStrom/codecombat,fabichoi/codecombat,zhangxiuquan/codecombat,nimda7/codecombat,jeremyprice/codecombat,EmbraceLife/codecombat,trotod/codecombat,amit2103/codecombat,nixel2007/codecombat,UltCombo/codecombat,amit2103/codecombat,weevilgenius/codecombat,wolut/codecombat,javatlacati/codecombat,TeodorMihai/codecombat,rao1219/codecombat,dboyliao/codecombat,eschuler21/codecombat,giaba90/codecombat