Testing
Added comment
Merge branch 'Efficient'

merge testing
Clean up
Merge testing again
EfMerge
test
Who
test
test
Test
fix merge error
yup
Testing merge
stashem
Cleaned up master merge tests
Added color method
new method as well
fixed merge error
implement method