conflicts resolved

added keyword mapper for me to work on (can merge into sectionmapper later) 

added samplequery/sampledata: contains html for first section and first query