typo fix
Merge branch 'e_01' into e_02

Conflicts:
	app/assets/javascripts/controllers/index_controller.js
Merge branch 'e_02' into e_03

Conflicts:
	app/assets/javascripts/controllers/index_controller.js