logo, devise views, login bar
Merge branch 'master' into cancan
test
no more heroku