test message
test message
Merge branch 'master' of github.com:ruzmale/test

Conflicts:
	html_css_js/index.html