changes to homepage
promos and logo in place
merged master into branch
add image upload works
merge master