awseward/capfromscratch — pull request #6 by awseward (2013-08-26 06:36:42+00:00)
Title: feel like behind master should be yellow, not red

yeah...
maybe somewhere along the line red could indicate a conflict when pulling changes