add something else
add some method
ad useful methods that do nothing
Merge branch 'upcase_name'

Conflicts:
	app/helpers/application_helper.rb