Started newGame and cleaned up code a bit
Code clean up
Fixed conflicts