Small changes with color and some merge conflicts
Merge branch 'master' of https://github.com/woodenToaster/EECS_448_Project