added latest changes to bob s home page
fixed conflict in bob.html