zx
Merge branch 'master' of https://github.com/DavidSalzer/reshet-static

Conflicts:
	js/script.js
font face