update README
Merge branch 'master' of https://github.com/200Creative/spree_bootstrap_frontend
Add variable comment, update README
Merge pull request #16 from leggers/master

removed `frontend` call that was causing NoMethodError
Merge branch 'master' of https://github.com/200Creative/spree_bootstrap_frontend
add with_shipping_method to ShippingRate
update README
update README
fix #18
update README
fixed no shipment ajustments error
Merge remote-tracking branch 'liquidautumn/master'
Copy over view changes from edge, specifically spree/spree@835248c504a346e2b991913c7da584f05a39f30c spree/spree@cdcdac31ea6fd42bbb5075d1e44bcfd14a6b680a spree/spree@2068a1aa1135ad8599ee49084e4049738fdd64c9 spree/spree@140904bc2465ce5433fea423f54602fc4014a9eb spree/spree@81c95fd4d471e7c68c7c3f78021af8c81777f4ae spree/spree@6854f98021690a40bcca0702a9081717d3742843 spree/spree@17fc149749f3d89f6f86950d7d5d56e141c35045
update README
fix SCSS syntax for error messages
Fix small layout errors in the checkout
Clarify language in the README
Tweak logo so existing spree logo configs work and fix some HTML indents

(cherry picked from commit a2c906b79c3fd251b9a67004794368ea886f5d21)
Update to boostrap 3.1 to fix glyphicons

(cherry picked from commit 4941e7d3056200890214c429d281c7f0ed359d61)
bump version number