anonymous
conflict resolved

Conflicts:
	js/pages/home.js