Reimplemented collision resolution
Merged GameScreen
fixed merge issues