l
Merge branch 'master' of https://github.com/kirrkev/Persona_Browser

Conflicts:
	html/js/main.js