added slideshow effect
fixed icon
fixed height of twitter widget
Merge branch 'gh-pages'

Conflicts:
	index.html
Merge pull request #17 from climatepolicy/master

merging changes