Made changes required by merging with newfeatures

Changed file and socket.io addresses and text containing "bravo"
Changed socke.io address for merger
Added an instruction for the waterDrop parameter
Changed addresses to new jthatch.co domain