Testing and Inheritance
Added more tests and made every game object know it's own location
dealt with merge