Merge branch 'gh-pages'
porisso
fixing mouseover
Merge branch 'master' into gh-pages