now with qunit
marker
formatting
adding display to test
Merge branch 'e_04' into e_04a

Conflicts:
	Gemfile
	Gemfile.lock
	spec/javascripts/specs/index_controller_spec.js
update test syntax
sorted index controller
spacing fix
spacing fix
more fixes
1.0 changes
underscoring
Merge branch 'e_01' into e_02

Conflicts:
	app/assets/javascripts/templates/index.handlebars
re-underscoring
fixing display
Merge branch 'e_02' into e_03
update to use actions object on controller
Merge branch 'e_03' into e_04

Conflicts:
	Gemfile.lock
	app/assets/javascripts/controllers/index_controller.js
	app/assets/javascripts/controllers/index_trip_controller.js
	app/assets/javascripts/models/trip.js
1.0 update
more 1.0 stuff