Merge branch 'gh-pages' of github.com:etiennelb/etiennelb.github.com into gh-pages

Conflicts:
	plugins/github.rb
Merge branch 'gh-pages' of github.com:etiennelb/etiennelb.github.com into gh-pages

Conflicts:
	plugins/github.rb