html
Merge branch 'master' of github.com:FyXi/prevezhdam

Conflicts:
	popup.html~
	style.css~