Logo added to header
merge with heroku changes? maybe scot pushed something? or someone else..