Merge branch 'addData' of https://github.com/HCI-Group7/HCI_Group7_Chrome_History_Review into addData

Conflicts:
	ListResult.html
	css/result.css
	js/result.js
	js/second.js
conflict

conflict