fix
fix
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
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