..
Teruggedraaid
en meer
Merge branch 'master' of https://github.com/henrilouis/ibrowse

Conflicts:
	js/view/historyView.js
	style/history.css