a LOT of work on the homepage
merged and fixed conflicts
df