It is actually 21M supply but the thing here is that there are those bitcoins lost so I think it is less than 21M now. Will it be still added? I don't think so, they will keep it the way it was since that is for the better of bitcoin. The less supply, the higher the demand and the higher the price. More inviting for investors.