added and passed off colors
Merge branch 'master' of github.com:adamjchristiansen/CS598R