Organizando o master
Merge branch 'master' of github.com:odraude7/ArRails

Conflicts:
	.gitignore
	config/initializers/devise.rb