Strip out C++ comments that came from a merge
Strip out C++ comments that came from a merge

davidfstr/discount,binki/discount,davidfstr/discount,davidfstr/discount,OliverLetterer/discount,davidfstr/discount,binki/discount,OliverLetterer/discount,OliverLetterer/discount,gm2bv/discount,gm2bv/discount,gm2bv/discount,binki/discount,binki/discount,gm2bv/discount,binki/discount