added more M2 stuff, changed GameLogic
Merge pull request #12 from reinaldo422/master

More M2 stuff