Fixed merge conflicts in uk.coffee.
Fixed merge conflicts in uk.coffee.

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