edited gitignore
Delete database.yml
merged
Merge branch 'master' of https://github.com/benweible/bw_bootstrap