js logic currently broken

Conflicts:
	js/application.js