Merge pull request #3 from 12-01Game/master

updating to master