minor changes to home and web page
conflict resolved