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

Conflicts:
	index.htm
	js/script.js
	recipe.htm
	user.htm