started implementing physics manager
resolving conflicts and finishing collision detection
merging