fix
fix
missing semicolon
missing semicolon
missing semicolon
update ember versions
weird json fix
Merge branch 'e_01' into e_02

Conflicts:
	Gemfile
Merge branch 'e_02' into e_03
Merge branch 'e_03' into e_04

Conflicts:
	app/controllers/trips_controller.rb
new gemfile
now with qunit
marker