added js functionality

Conflicts:
	js/application.js