list item
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/components/home-page/home.html