githubteacher/nfjs-dallas — pull request #3 by githubstudent (2013-05-17 21:26:40+00:00)
Title: Conflict?

I sure hope not!