smspezzano/d2jive — pull request #11 by dvmonroe (2014-03-24 20:14:11+00:00)
Title: fixing merge

maybe