to pull web

nothing
My first merge has been finished

I'm worried that it goes to fail.
Merge branch 'master' of https://github.com/Funkest/Opera

Conflicts:
	bookmarks.adr
Add key shortcut ini

add