merging in static HTML site and test functionality

merging in static HTML site and test functionality