try merge
Site updated at 2014-01-08 19:30:54 UTC
Merge branch 'gh-pages'

Conflicts:
	Rakefile
Removed master tree