creating conflict from test
Merge branch 'test3'

Conflicts:
	app/views/static_pages/about.html.erb