Fixed color problems
Merge branch 'master' of https://github.com/jbold569/489_Project