corrigido texto e nomes da botões
aplicado layout do bootstrap nas views
Merge branch 'master' of https://github.com/xandregc/agc

Conflicts:
	app/views/welcome/contato.html.erb