edit
Merge branch 'adil' of github.com:ams2378/aes_core into adil