more hovering
Merge branch 'master' of git://github.com/shanthibeth/summer-2014