header changes
Merge branch 'master' of github.com:asubota/havkaValera

Conflicts:
	public/js/logo.js
	views/index.ejs