dsfgsgh
Merge remote-tracking branch 'origin/master' into kamil

Conflicts:
	css/style.css