white_bg
Merge branch 'dev'

Conflicts:
	public_html/css/teszt.css
teszt
teszt
Merge branch 'dev'

Conflicts:
	public_html/css/main.css