rails with bootstrap
conflict with gitignore resolved
conflict with gitignore resolved