poprawiony css
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/global.css
css
css
a