added jasmine for javascript testing

Conflicts:
	Gemfile.lock
	config/routes.rb