Add pre heroku-push commit
Empty pages/index.haml
Merge branch 'master' of https://github.com/billfienberg/shipping_calculator
Add 'hello' to pages/index.haml