small merge changes?
added database.yml to .gitignore to avoid local db issues across multiple users