1
Merge branch 'new-branch'

Conflicts:
	css/all.css