Change some files
Merge branch 'another'

Conflicts:
	app/views/layouts/application.html.erb