Merge pull request #2 from BeaconOfDeath/dev

Dev
Merge branch 'master' of https://github.com/BeaconOfDeath/DNAgame into dev