added image rollover
changed link effects
merged dev to master