Need to change to my branch
Bringing my stuff in

Level and assets mainly
Fixed some animations

Added some water
Merge remote-tracking branch 'origin/master'