ignores database.yml
ignores database attempt 2
sheeit
fix conflicts
fix gitignore
deleted development.log
Merge pull request #2 from russelltaff/master

updates gitignore