new changes css
Merge remote branch 'origin/master'

Conflicts:
	style.css
add new changes css