merged and fixed, removed gameobject.h references
Merge pull request #2 from nancywong/nancy

merged and fixed, removed gameobject.h references