Jon1213/awesome_group_project — pull request #3 by mwmckenna (2014-11-18 22:26:01+00:00)
Title: Added text

Changed text to add a conflict