rails with boostrap
conflict with gitignore resolved