fixed color of water and added new icons
Merge branch 'gh-pages' of git://github.com/dannywils/ctf into gh-pages