made changes to database.yml, gemfile, got bootstrap working
Merge branch 'master' of github.com:wgpatrick/momwebsite
fixed merge