Criando relatorio de pedidos
Adicionando layout
Alteraçoes de layout de renato
Removendo DS_Store
Gitignore
Delete log
Delete database.yml
Removendo Gemfile cached
Alterando gitignore
Removendo db devel
Merge branch 'master' into devel

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/style.css
	app/views/layouts/application.html.erb
	config/database.yml
Style cadastrar