CPU changes
Merge branch 'master' of https://github.com/jguarni/CISC360Project1.git