githubteacher/example-basic — pull request #13 by githubstudent (2013-09-05 18:54:25+00:00)
Title: Conflict

Make it red