Added FPS label and changed water shader
Merge conflict
Merge branch 'master' of https://github.com/Kevlanche/BMD