Attempting to fix merge issues again
Attempting to fix merge issues again
 reimplementing level stuff, added water to second level
SceneManager setup
SceneManager setup
merging
scene manager tweaking