Added merge method in GameObject
Merge branch 'master' of https://github.com/danieka/indavaders
Fixed merge and fight method, started with merge test
Merge branch 'master' of https://github.com/danieka/indavaders