correc bug
correc bugs

Conflicts:
	Resources/style.css