Added initial skeleton for 2-6
Fixed incorrect implementation of PKCS#7 padding - now padding with a new block if text is multiple of blocksize