minor color changes
Merge remote-tracking branch 'origin/master'
tmp; modifying shaders
Merge remote-tracking branch 'origin/master'