estou testando meu commit
Aprimorando Views Edit e Show
Merge branch 'upstream/master'

Conflicts:
	app/views/questionarios/index.html.erb
atualizes
testants o aptana
BBEBEBE