blah
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
requisite commit
Merge remote-tracking branch 'origin/master'
changed colors to make constant