html page added
changes to server
fixing merge conflicts