Patrick-W-McMahon/Jinx-Engine — pull request #6 by Patrick-W-McMahon (2014-07-25 20:07:21+00:00)
Title: getting Dev to match with master

just noticed i was working on master when i should have been working on Dev. Moving updates to Dev.