changed home/about content
changed the form and removed the weather data link
changed the logo
merge conflict
merge conflict removed