Cleaning up code
Merge branch 'master' of https://github.com/carlodelmundo/ece4534

 I forgot to pull