first commit to heroku
different redirect
different redirect
different redirect with real home
merge conflicts done