Made changes required by merging with newfeatures

Changed file and socket.io addresses and text containing "bravo"