Update database.yml
Update database.yml
Merge branch 'master' of https://github.com/joaovitoras/kiira-onew

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/joaovitoras/kiira-onew

Conflicts:
	config/environments/development.rb
mail funfando agora, de verdade <3
Merge branch 'master' of https://github.com/joaovitoras/kiira-onew