commit rakefile
Merge branch 'gh-pages'

Conflicts:
	Rakefile
Removed master tree