MattMatt0240/DemiGod — pull request #2 by MattMatt0240 (2013-11-18 21:48:20+00:00)
Title: merge latest code into test branch

Did it backwards, merged from master to test branch (still trying to figure out github)