Added twitter feed to homepage
Solved conflicts
fixed hover images on homepage