Resolved ca.coffee merge conflicts.
Resolved ca.coffee merge conflicts.

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