new folder
update in branch
Merge remote-tracking branch 'origin/style'

Conflicts:
	style.css