resolved rename conflict
resolved link_to conflict
add bootstrap for styling
add custom css file
resolved conflict applied header styling
update overrule css
revise layout and content for results page
Merge current code