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

Conflicts:
	index.htm
	styles/reshet-style.css