Changes to be committed:
	modified:   html/index.html
 Add form
Merge branch 'master' of http://github.com/meganosro/test_work
 Changes to be committed:
	new file:   htaccess/.htaccess
	new file:   htaccess/.htpasswd
	new file:   htaccess/index.php
	modified:   html/style2.css
Merge branch 'master' of http://github.com/meganosro/test_work