added hover photos with info to homepage
fixed conflicts