githubteacher/example-basic — pull request #14 by githubstudent (2013-09-05 18:56:04+00:00)
Title: Conflict

Make it red