changing ip address of shiny server
merge conflict