updated style
Merge branch 'master' of https://github.com/sergio8311/Test-page

Conflicts:
	index.html
	stylesheet.css