worked on homepage logic and prettiness
merged