Fix merge conflicts in es-ES.coffee
Fix merge conflicts in es-ES.coffee

JordanLittell/codecombat,JordanLittell/codecombat,bsmr-x-script/codecombat,nimda7/codecombat,codecombat/codecombat,edtrist/codecombat,Cooky8197/codecombat,Akhuta/codecombat,nimda7/codecombat,fabichoi/codecombat,jhoon/codecombat,edtrist/codecombat,javatlacati/codecombat,Driphter/codecombat,jeremiahyan/codecombat,MonkStrom/codecombat,tpai/codecombat,differentmatt/codecombat,khoa102/codecombat,MonkStrom/codecombat,jacobakkerboom/codecombat,javatlacati/codecombat,VilkkuV/codecombat,Zerrien/codecombat,AkaKaras/codecombat,laituan245/codecombat,jacobakkerboom/codecombat,laituan245/codecombat,tpai/codecombat,fabichoi/codecombat,laituan245/codecombat,javatlacati/codecombat,nimda7/codecombat,fabichoi/codecombat,Fokusnica/codecombat,edtrist/codecombat,jhoon/codecombat,Zerrien/codecombat,Driphter/codecombat,codecombat/codecombat,bsmr-x-script/codecombat,jhoon/codecombat,zhangxiuquan/codecombat,jacobakkerboom/codecombat,laituan245/codecombat,kidaa/codecombat,jeremyprice/codecombat,differentmatt/codecombat,aashaka/codecombat,differentmatt/codecombat,wgsu/codecombat,kidaa/codecombat,Cooky8197/codecombat,Minhir/codecombat,khoa102/codecombat,duybkict/codecombat,probil/codecombat,weevilgenius/codecombat,Zerrien/codecombat,differentmatt/codecombat,Fokusnica/codecombat,icodegame/codecombat,Fokusnica/codecombat,Akhuta/codecombat,weevilgenius/codecombat,aashaka/codecombat,aashaka/codecombat,Cooky8197/codecombat,Fokusnica/codecombat,VilkkuV/codecombat,bsmr-x-script/codecombat,AkaKaras/codecombat,codecombat/codecombat,zhangxiuquan/codecombat,nimda7/codecombat,Minhir/codecombat,JordanLittell/codecombat,khoa102/codecombat,wgsu/codecombat,zhangxiuquan/codecombat,codecombat/codecombat,jeremyprice/codecombat,JordanLittell/codecombat,jeremyprice/codecombat,Akhuta/codecombat,jeremiahyan/codecombat,jacobakkerboom/codecombat,wgsu/codecombat,UltCombo/codecombat,Driphter/codecombat,wgsu/codecombat,jhoon/codecombat,codecombat/codecombat,Zacharias030/codecombat,icodegame/codecombat,weevilgenius/codecombat,UltCombo/codecombat,icodegame/codecombat,duybkict/codecombat,zhangxiuquan/codecombat,Cooky8197/codecombat,jeremiahyan/codecombat,bsmr-x-script/codecombat,UltCombo/codecombat,Zerrien/codecombat,edtrist/codecombat,AkaKaras/codecombat,kidaa/codecombat,kidaa/codecombat,tpai/codecombat,probil/codecombat,VilkkuV/codecombat,javatlacati/codecombat,Zacharias030/codecombat,MonkStrom/codecombat,Minhir/codecombat,VilkkuV/codecombat,jeremyprice/codecombat,tpai/codecombat,javatlacati/codecombat,duybkict/codecombat,Zacharias030/codecombat,Driphter/codecombat,AkaKaras/codecombat,weevilgenius/codecombat,probil/codecombat,UltCombo/codecombat,icodegame/codecombat,khoa102/codecombat,probil/codecombat,MonkStrom/codecombat,aashaka/codecombat,jeremiahyan/codecombat,Zacharias030/codecombat,fabichoi/codecombat,duybkict/codecombat,Minhir/codecombat,Akhuta/codecombat