weeeee
hopefully fix this real mess
Merge branch 'master' of https://github.com/aidan-coward/config-files

Conflicts:
	luakit/globals.lua
	luakit/local-share/bookmarks.db
	luakit/local-share/cookies.db
	luakit/local-share/history.db