Merge pull request #29 from peachesandcorn/master

rand fix to equipfact
Merge remote-tracking branch 'upstream/master'
enemyattfact added