Master branch 4
Master branch 5
Merge branch 'master_branch5'

Conflicts:
	app/index.erb