Small changes to make function easier to read
Refactored the key expansion function
Testing code
Merge branch 'master' of https://github.com/khmacdonald/AES