zrivest/course_smart — pull request #5 by rskelley9 (2013-11-07 22:31:18+00:00)
Title: Fixed Merge Conflict

fixed seed file merge conflict