bundle update
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype
bundle update
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype
bundle update
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype
re-enable bootstrap-sass
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype