style change
Merge branch 'master' of https://github.com/TrainingCourse/13-Web-113
style
Merge branch 'master' of https://github.com/TrainingCourse/13-Web-113

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