plz work

Conflicts:
	assets/js/main.js